Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 8146)
+++ /trunk/data/defaultpresets.xml	(revision 8147)
@@ -7372,4 +7372,10 @@
             <reference ref="leaf" />
         </item> <!-- Forest -->
+        <item name="Cutline" icon="styles/standard/misc/landmark/cutline.svg" type="way" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=cutline" />
+            <space />
+            <key key="man_made" value="cutline" />
+            <combo key="cutline" text="Type" values="border,firebreak,hunting,loggingmachine,pipeline,piste,section" values_context="cutline" />
+        </item> <!-- Cutline -->
         <item name="Grassland" icon="styles/standard/misc/landuse/meadow.svg" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=grassland"
Index: /trunk/data/validator/combinations.mapcss
===================================================================
--- /trunk/data/validator/combinations.mapcss	(revision 8146)
+++ /trunk/data/validator/combinations.mapcss	(revision 8147)
@@ -105,5 +105,6 @@
 *[reservoir_type               ][landuse!=reservoir][water!=reservoir],
 *[bridge:movable               ][bridge!=movable],
-*[parking                      ][amenity!~/^(parking|parking_space|parking_entrance|motorcycle_parking)$/]
+*[parking                      ][amenity!~/^(parking|parking_space|parking_entrance|motorcycle_parking)$/],
+*[cutline                      ][man_made!=cutline],
 *[bunker_type                  ][military!=bunker] {
   throwWarning: tr("{0} without {1}", "{0.key}", "{1.tag}");
Index: /trunk/data/validator/geometry.mapcss
===================================================================
--- /trunk/data/validator/geometry.mapcss	(revision 8146)
+++ /trunk/data/validator/geometry.mapcss	(revision 8147)
@@ -6,4 +6,6 @@
 node[man_made=embankment],
 node[man_made=groyne],
+node[man_made=cutline],
+node[cutline],
 node[aerialway=cable_car],
 node[aerialway=gondola],
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 8146)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 8147)
@@ -1442,4 +1442,13 @@
 node[man_made=water_works] {
     icon-image: "misc/landmark/water_works.png";
+    set icon_z17;
+    text: auto;
+}
+way[man_made=cutline] {
+    width: 2;
+    color: cutline#99ff55;
+}
+node[man_made=cutline] {
+    icon-image: "misc/deprecated.png";
     set icon_z17;
     text: auto;