Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 17467)
+++ trunk/resources/data/defaultpresets.xml	(revision 17468)
@@ -4099,11 +4099,4 @@
             <preset_link preset_name="Building" />
         </item> <!-- Community Centre -->
-        <item name="Embassy" icon="presets/service/embassy.svg" type="node,closedway,multipolygon" preset_name_label="true">
-            <link wiki="Tag:amenity=embassy" />
-            <space />
-            <key key="amenity" value="embassy" />
-            <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
-        </item> <!-- Embassy -->
         <item name="Courthouse" icon="presets/service/courthouse.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:amenity=courthouse" />
@@ -7473,4 +7466,13 @@
         <reference ref="link_contact_address" />
     </item> <!-- Private company -->
+    <item name="Diplomatic" icon="presets/office/diplomatic.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
+        <link wiki="Tag:office=diplomatic" />
+        <space />
+        <key key="office" value="diplomatic" />
+        <text key="name" text="Name" />
+        <combo key="diplomatic" text="Type" values="consulate,embassy,liaison" />
+        <reference ref="oh_wheelchair" />
+        <reference ref="link_contact_address" />
+    </item> <!-- Diplomatic -->
     <item name="Educational institution" icon="presets/office/educational_institution.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link wiki="Tag:office=educational_institution" />
Index: trunk/resources/data/validator/deprecated.mapcss
===================================================================
--- trunk/resources/data/validator/deprecated.mapcss	(revision 17467)
+++ trunk/resources/data/validator/deprecated.mapcss	(revision 17468)
@@ -2246,3 +2246,12 @@
 }
 
+/* #20338 */
+*[amenity=embassy] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "office=diplomatic + diplomatic=embassy";
+  group: tr("deprecated tagging");
+  fixAdd: "office=diplomatic";
+  fixChangeKey: "amenity => diplomatic";
+}
+
 /* When tags are deprecated they should be added to ignoretags.cfg too. */
Index: trunk/resources/data/validator/ignoretags.cfg
===================================================================
--- trunk/resources/data/validator/ignoretags.cfg	(revision 17467)
+++ trunk/resources/data/validator/ignoretags.cfg	(revision 17468)
@@ -702,4 +702,5 @@
 E:kp
 E:pk
+K:amenity=embassy
 ;
 ; Tags not yet decided (to remove from this section when added or moved up when deprecated)