Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 11579)
+++ trunk/data/defaultpresets.xml	(revision 11583)
@@ -5211,4 +5211,5 @@
             </optional>
         </item> <!-- Shower -->
+        <separator/>
         <item name="Post Box" icon="presets/service/post_box.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_box"
@@ -5272,4 +5273,11 @@
             </optional>
         </item> <!-- Clock -->
+        <item name="Photo booth" icon="presets/service/photo_booth.svg" type="node" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=photo_booth" />
+            <space />
+            <key key="amenity" value="photo_booth" />
+            <reference ref="name_operator_oh_wheelchair" />
+        </item> <!-- Photo booth -->
+        <separator/>
         <item name="Recycling Container" icon="presets/service/recycling/recycling_container.svg" type="node,closedway" preset_name_label="true">
            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
@@ -8259,5 +8267,5 @@
         <space />
         <key key="amenity" value="vending_machine" />
-        <multiselect key="vending" text="Vending products" values="admission_tickets;animal_feed;bicycle_tube;cigarettes;condoms;drinks;elongated_coin;excrement_bags;food;milk;newspapers;parking_tickets;parcel_pickup;parcel_mail_in;photos;public_transport_plans;public_transport_tickets;SIM_cards;stamps;sweets;telephone_vouchers;toys" values_searchable="true" />
+        <multiselect key="vending" text="Vending products" values="admission_tickets;animal_feed;bicycle_tube;cigarettes;coffee;condoms;drinks;elongated_coin;excrement_bags;food;milk;newspapers;parking_tickets;parcel_pickup;parcel_mail_in;photos;public_transport_tickets;SIM_cards;stamps;sweets;telephone_vouchers;toys" values_searchable="true" />
         <text key="operator" text="Operator" />
         <text key="ref" text="Reference number" />
Index: trunk/data/validator/deprecated.mapcss
===================================================================
--- trunk/data/validator/deprecated.mapcss	(revision 11579)
+++ trunk/data/validator/deprecated.mapcss	(revision 11583)
@@ -1047,4 +1047,20 @@
 }
 
+/* #14376 */
+node[vending=photos][amenity=vending_machine],
+node[vending=photo][amenity=vending_machine] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "amenity=photo_booth";
+  group: tr("deprecated tagging");
+  fixRemove: "vending";
+  fixAdd: "amenity=photo_booth";
+
+}
+node[vending=photos][amenity!=vending_machine] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "amenity=photo_booth";
+  group: tr("deprecated tagging");
+}
+
 /* #13653 */
 node[highway=emergency_access_point][phone][!emergency_telephone_code],