Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 11338)
+++ trunk/data/defaultpresets.xml	(revision 11346)
@@ -7334,4 +7334,13 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Seafood -->
+        <item name="Dairy" icon="presets/shop/groceries/dairy.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dairy"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=dairy"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=dairy" />
+            <space />
+            <key key="shop" value="dairy" />
+            <reference ref="name_operator_oh_wheelchair" />
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- Dairy -->
         <item name="Deli (Fine Food)" icon="presets/shop/groceries/deli.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=deli"
Index: trunk/data/validator/combinations.mapcss
===================================================================
--- trunk/data/validator/combinations.mapcss	(revision 11338)
+++ trunk/data/validator/combinations.mapcss	(revision 11346)
@@ -205,5 +205,6 @@
 }
 
-/* {0.tag} together with {1.key}, see #10837 */
+/* {0.tag} together with {1.key}, see #10837, #14034 */
+*[amenity=vending_machine][shop],
 *[noname?][name] {
   throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.key}");