Index: trunk/data/validator/combinations.mapcss
===================================================================
--- trunk/data/validator/combinations.mapcss	(revision 15624)
+++ trunk/data/validator/combinations.mapcss	(revision 15634)
@@ -145,4 +145,5 @@
 *[leisure=pitch][!sport],
 *[aeroway=terminal][!building],
+*[office=government][!government],
 *[power=generator][!generator:source],
 *[amenity=recycling][!/^recycling:/][recycling_type!=centre],
Index: trunk/data/validator/deprecated.mapcss
===================================================================
--- trunk/data/validator/deprecated.mapcss	(revision 15624)
+++ trunk/data/validator/deprecated.mapcss	(revision 15634)
@@ -1069,4 +1069,10 @@
 }
 
+*[office=administrative] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  group: tr("deprecated tagging");
+  suggestAlternative: "office=government";
+}
+
 /* #12708 */
 *[vending=news_papers] {