Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 15626)
+++ trunk/data/defaultpresets.xml	(revision 15634)
@@ -6485,11 +6485,4 @@
         <reference ref="link_contact_address" />
     </item> <!-- Accountant -->
-    <item name="Administrative" icon="presets/office/administrative.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
-        <link wiki="Tag:office=administrative" />
-        <space />
-        <key key="office" value="administrative" />
-        <reference ref="name_operator_oh_wheelchair" />
-        <reference ref="link_contact_address" />
-    </item> <!-- Administrative -->
     <item name="Advertising agency" icon="presets/office/advertising_agency.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link wiki="Tag:office=advertising_agency" />
@@ -6553,5 +6546,5 @@
         <key key="office" value="government" />
         <text key="name" text="Name" />
-        <combo key="government" text="Type" values="administrative,cadaster,customs,education,healthcare,legislative,migration,ministry,pension_fund,prosecutor,public_service,register_office,social_security,social_services,tax,transportation" />
+        <combo key="government" text="Type" values="administrative,audit,cadaster,culture,customs,data_protection,education,environment,forestry,healthcare,legislative,migration,ministry,pension_fund,prosecutor,public_service,register_office,social_security,social_services,statistics,tax,transportation" />
         <reference ref="oh_wheelchair" />
         <reference ref="link_contact_address" />
Index: trunk/data/validator/combinations.mapcss
===================================================================
--- trunk/data/validator/combinations.mapcss	(revision 15626)
+++ 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 15626)
+++ 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] {