Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 15860)
+++ trunk/data/defaultpresets.xml	(revision 15867)
@@ -2307,4 +2307,5 @@
                 <check key="bicycle" text="Bicycle" />
                 <check key="scooter" text="Scooter" />
+                <check key="motorcycle" text="Motorcycle" />
                 <check key="motorcar" text="Car" />
                 <check key="truck" text="Truck" />
Index: trunk/data/validator/deprecated.mapcss
===================================================================
--- trunk/data/validator/deprecated.mapcss	(revision 15860)
+++ trunk/data/validator/deprecated.mapcss	(revision 15867)
@@ -1928,2 +1928,10 @@
   group: tr("deprecated tagging");
 }
+
+/* #18659 */
+*[car][amenity=charging_station] {
+  throwWarning: tr("{0} is deprecated", "{0.key}");
+  suggestAlternative: "motorcar";
+  group: tr("deprecated tagging");
+  fixChangeKey: "car => motorcar";
+}