Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 15527)
+++ trunk/data/defaultpresets.xml	(revision 15528)
@@ -6342,4 +6342,11 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Photo -->
+        <item name="Weapons" icon="presets/shop/weapons.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:shop=weapons" />
+            <space />
+            <key key="shop" value="weapons" />
+            <reference ref="name_oh_wheelchair" />
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- Weapons -->
         <item name="Funeral Directors" icon="presets/shop/funeral_directors.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:shop=funeral_directors" />
Index: trunk/data/validator/deprecated.mapcss
===================================================================
--- trunk/data/validator/deprecated.mapcss	(revision 15527)
+++ trunk/data/validator/deprecated.mapcss	(revision 15528)
@@ -1821,4 +1821,6 @@
 
 /* #18267 */
+node[man_made=pipeline_marker],
+node[man_made=marker],
 node[pipeline=marker],
 node[power=marker],