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)