diff --git a/applications/utilities/surface/surfaceAutoPatch/Make/files b/applications/utilities/surface/surfaceAutoPatch/Make/files
new file mode 100644
index 0000000000..38a0ebbbf2
--- /dev/null
+++ b/applications/utilities/surface/surfaceAutoPatch/Make/files
@@ -0,0 +1,3 @@
+surfaceAutoPatch.C
+
+EXE = $(FOAM_APPBIN)/surfaceAutoPatch
diff --git a/applications/utilities/surface/surfaceAutoPatch/Make/options b/applications/utilities/surface/surfaceAutoPatch/Make/options
new file mode 100644
index 0000000000..e4751082e1
--- /dev/null
+++ b/applications/utilities/surface/surfaceAutoPatch/Make/options
@@ -0,0 +1,8 @@
+EXE_INC = \
+    /* -I$(LIB_SRC)/cfdTools/general/lnInclude */ \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/triSurface/lnInclude
+
+EXE_LIBS = \
+    -lmeshTools \
+    -ltriSurface
diff --git a/applications/utilities/surface/surfaceAutoPatch/surfaceAutoPatch.C b/applications/utilities/surface/surfaceAutoPatch/surfaceAutoPatch.C
new file mode 100644
index 0000000000..60f078409c
--- /dev/null
+++ b/applications/utilities/surface/surfaceAutoPatch/surfaceAutoPatch.C
@@ -0,0 +1,129 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Application
+    surfaceAutoPatch
+
+Description
+    Patches surface according to feature angle. Like autoPatch.
+
+\*---------------------------------------------------------------------------*/
+
+#include "triangle.H"
+#include "triSurface.H"
+#include "argList.H"
+#include "surfaceFeatures.H"
+#include "treeBoundBox.H"
+#include "meshTools.H"
+#include "OFstream.H"
+
+using namespace Foam;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Main program:
+
+int main(int argc, char *argv[])
+{
+    argList::noParallel();
+    argList::validArgs.clear();
+    argList::validArgs.append("input surface file");
+    argList::validArgs.append("output surface file");
+    argList::validArgs.append("included angle [0..180]");
+    argList args(argc, argv);
+
+    fileName inFileName(args.additionalArgs()[0]);
+    fileName outFileName(args.additionalArgs()[1]);
+    scalar includedAngle(readScalar(IStringStream(args.additionalArgs()[2])()));
+
+    Pout<< "Surface        : " << inFileName << nl
+        << endl;
+
+
+    // Read
+    // ~~~~
+
+    Info << "Reading : " << inFileName << endl;
+    triSurface surf(inFileName);
+
+    Info<< "Read surface:" << endl;
+    surf.writeStats(Info);
+    Info<< endl;
+    
+
+
+    // Construct features from surface&featureangle
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    Info<< "Constructing feature set from included angle " << includedAngle
+        << endl;
+
+    surfaceFeatures set(surf, includedAngle);
+
+    Pout<< nl
+        << "Feature set:" << nl
+        << "    feature points : " << set.featurePoints().size() << nl
+        << "    feature edges  : " << set.featureEdges().size() << nl
+        << "    of which" << nl
+        << "        region edges   : " << set.nRegionEdges() << nl
+        << "        external edges : " << set.nExternalEdges() << nl
+        << "        internal edges : " << set.nInternalEdges() << nl
+        << endl;
+
+    // Get per-edge status.
+    boolList borderEdge(surf.nEdges(), false);
+    forAll(set.featureEdges(), i)
+    {
+        borderEdge[set.featureEdges()[i]] = true;
+    }
+
+    labelList faceRegion(surf.size());
+    label nRegions = surf.markZones(borderEdge, faceRegion);
+
+    // Reregion triangles.
+    forAll(surf, i)
+    {
+        surf[i].region() = faceRegion[i];
+    }
+
+    // Create some patches
+    surf.patches().setSize(nRegions);
+
+    forAll(surf.patches(), patchI)
+    {
+        surf.patches()[patchI].name() = "patch" + Foam::name(patchI);
+        surf.patches()[patchI].geometricType() = "empty";
+    }
+
+
+    Info << "Writing : " << outFileName << endl;
+    surf.write(outFileName, true);
+
+    Info<< "End\n" << endl;
+
+    return 0;
+}
+
+
+// ************************************************************************* //