Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 17939)
+++ trunk/resources/data/defaultpresets.xml	(revision 17940)
@@ -2827,5 +2827,7 @@
             <text key="operator" text="Operator" />
             <reference ref="oh" />
+            <check key="service:bicycle:stand" text="Stand" />
             <check key="service:bicycle:pump" text="Free bicycle pump" />
+            <check key="service:bicycle:tools" text="Tools" text_context="bicycle_repair_station"/>
             <check key="service:bicycle:chain_tool" text="Chain tool" />
             </optional>
Index: trunk/resources/data/validator/deprecated.mapcss
===================================================================
--- trunk/resources/data/validator/deprecated.mapcss	(revision 17939)
+++ trunk/resources/data/validator/deprecated.mapcss	(revision 17940)
@@ -2257,3 +2257,11 @@
 }
 
+/* #11019 */
+*[service:bicycle:chaintool] {
+  throwWarning: tr("{0} is deprecated", "{0.key}");
+  suggestAlternative: "service:bicycle:chain_tool";
+  group: tr("deprecated tagging");
+  fixChangeKey: "service:bicycle:chaintool => service:bicycle:chain_tool";
+}
+
 /* 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 17939)
+++ trunk/resources/data/validator/ignoretags.cfg	(revision 17940)
@@ -693,4 +693,5 @@
 K:amenity=embassy
 K:shoulder=none
+E:service:bicycle:chaintool
 ;
 ; Tags not yet decided (to remove from this section when added or moved up when deprecated)