Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 10094)
+++ trunk/data/defaultpresets.xml	(revision 10095)
@@ -4528,15 +4528,4 @@
     </group> <!-- Place of Worship -->
     <group name="Public Building" icon="presets/townhall.png">
-        <item name="Public Building" icon="styles/standard/service.png" type="node,closedway,multipolygon" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building"
-                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=public_building"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=public_building"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=public_building"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=public_building" />
-            <space />
-            <key key="amenity" value="public_building" />
-            <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
-        </item> <!-- Public Building -->
         <item name="Town Hall" icon="presets/townhall.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall"
@@ -5985,5 +5974,5 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:building" />
             <space />
-            <combo key="building" text="Building" values="yes,roof,garage,garages,industrial,school,hangar,commercial,service,train_station,barn,stable,cabin,farm_auxiliary,transportation,greenhouse,office,university,hospital,kindergarten,manufacture,warehouse,retail,shed,storage_tank,supermarket,gasometer,silo,cowshed,construction,basilica,cathedral,chapel,church,temple,mosque,synagogue,transformer_tower" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
+            <combo key="building" text="Building" values="yes,roof,garage,garages,industrial,school,hangar,commercial,service,train_station,barn,stable,cabin,farm_auxiliary,transportation,greenhouse,office,university,hospital,kindergarten,manufacture,warehouse,retail,shed,storage_tank,supermarket,gasometer,silo,cowshed,construction,basilica,cathedral,chapel,church,temple,mosque,synagogue,transformer_tower,public" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
             <text key="name" text="Name" />
             <combo key="building:levels" text="Levels" values="1,2,3,4,5,6,7,8,9,10,11" text_context="building" />
Index: trunk/data/validator/deprecated.mapcss
===================================================================
--- trunk/data/validator/deprecated.mapcss	(revision 10094)
+++ trunk/data/validator/deprecated.mapcss	(revision 10095)
@@ -814,2 +814,15 @@
   suggestAlternative: "wall=noise_barrier";
 }
+
+/* #8978, 12588 */
+*[amenity=public_building] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "amenity=townhall";
+  suggestAlternative: "amenity=community_centre";
+  suggestAlternative: "amenity=hospital";
+  suggestAlternative: "leisure=sports_centre";
+  suggestAlternative: "office=government";
+  suggestAlternative: "building=hospital";
+  suggestAlternative: "building=public";
+  suggestAlternative: "...";
+}
Index: trunk/data/validator/ignoretags.cfg
===================================================================
--- trunk/data/validator/ignoretags.cfg	(revision 10094)
+++ trunk/data/validator/ignoretags.cfg	(revision 10095)
@@ -138,5 +138,4 @@
 K:place=allotments
 K:building=civic
-K:building=public
 K:building=houseboat
 K:building=static_caravan