Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 9036)
+++ trunk/data/defaultpresets.xml	(revision 9037)
@@ -345,4 +345,11 @@
         </optional>
     </chunk>
+    <chunk id="operator_substance">
+        <text key="operator" text="Operator" />
+        <combo key="substance" text="Substance" values="water,gas,heat,oil,sewage" />
+    </chunk>
+    <chunk id="support">
+        <combo key="support" text="Support" values="pole,wall_mounted,billboard,ground" values_context="mounting/support" />
+    </chunk>
   <!-- Link chunks -->
   <chunk id="link_contact_address">
@@ -1318,5 +1325,5 @@
             <key key="traffic_sign" value="maxspeed" />
             <text key="maxspeed" text="Max. speed (km/h)" />
-        </item> <!-- City Limit -->
+        </item> <!-- Speed Limit -->
         <item name="Speed Camera" icon="presets/speed_camera.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=speed_camera"
@@ -4742,5 +4749,5 @@
             <optional>
                 <combo key="display" text="Display" values="analog,digital,sundial,unorthodox" />
-                <combo key="support" text="Support" values="pole,wall_mounted,billboard,ground" values_context="mounting/support" />
+                <reference ref="support" />
                 <combo key="visibility" text="Visibility/readability" values="house,street,area" display_values="house (up to 5m),street (up to 20m),area (more than 20m)" />
                 <check key="date" text="Shows current date" />
@@ -5632,8 +5639,15 @@
             <space />
             <key key="man_made" value="pipeline" />
-            <text key="operator" text="Operator" />
-            <combo key="type" text="Type" values="water,gas,heat,oil,sewage" />
+            <reference ref="operator_substance" />
             <combo key="location" text="Location" values="underground,underwater,overground" values_context="pipeline" />
         </item> <!-- Pipeline -->
+        <item name="Pipeline Marker" type="node" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:pipeline=marker" />
+            <space />
+            <key key="pipeline" value="marker" />
+            <text key="ref" text="Reference" />
+            <reference ref="operator_substance" />
+            <reference ref="support" />
+        </item> <!-- Pipeline Marker -->
         <item name="Crane" icon="presets/crane.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane"
Index: trunk/data/validator/deprecated.mapcss
===================================================================
--- trunk/data/validator/deprecated.mapcss	(revision 9036)
+++ trunk/data/validator/deprecated.mapcss	(revision 9037)
@@ -542,2 +542,9 @@
   fixAdd: "intermittent=yes";
 }
+
+*[type][man_made=pipeline],
+*[type][pipeline=marker] {
+  throwWarning: tr("{0} is deprecated", "{0.key}");
+  suggestAlternative: "substance";
+  fixChangeKey: "type => substance";
+}