Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 7685)
+++ /trunk/data/defaultpresets.xml	(revision 7686)
@@ -5985,4 +5985,11 @@
             <reference ref="link_contact" />
         </item> <!-- Beverages -->
+        <item name="Wine" icon="styles/standard/shop/wine.svg" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=wine" />
+            <space />
+            <key key="shop" value="wine" />
+            <reference ref="name_oh" />
+            <reference ref="link_contact" />
+        </item> <!-- Wine -->
     </group> <!-- Food -->
     <group name="Clothes" icon="styles/standard/shop/clothes.png">
@@ -6596,4 +6603,11 @@
             <reference ref="link_contact" />
         </item> <!-- Pet -->
+        <item name="Funeral Directors" icon="styles/standard/shop/funeral_directors.svg" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=funeral_directors" />
+            <space />
+            <key key="shop" value="funeral_directors" />
+            <reference ref="name_oh" />
+            <reference ref="link_contact" />
+        </item> <!-- Funeral Directors -->
     </group> <!-- Other -->
         <separator/>
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 7685)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 7686)
@@ -1524,4 +1524,6 @@
 area[shop=antiques],
 area[shop=music],
+area[shop=funeral_directors],
+area[shop=wine],
 area[shop=bag] {
     fill-color: shop#00005f;
@@ -1883,4 +1885,14 @@
 node[shop=music] {
     icon-image: "shop/music.svg";
+    set icon_z17;
+    text: auto;
+}
+node[shop=funeral_directors] {
+    icon-image: "shop/funeral_directors.svg";
+    set icon_z17;
+    text: auto;
+}
+node[shop=wine] {
+    icon-image: "shop/wine.svg";
     set icon_z17;
     text: auto;