Index: trunk/data/validator/combinations.mapcss
===================================================================
--- trunk/data/validator/combinations.mapcss	(revision 15359)
+++ trunk/data/validator/combinations.mapcss	(revision 15360)
@@ -143,4 +143,5 @@
 *[aeroway=terminal][!building],
 *[power=generator][!generator:source],
+*[amenity=recycling][!/^recycling:/],
 *[amenity=social_facility][!social_facility],
 *[amenity=place_of_worship][!religion] {
Index: trunk/data/validator/deprecated.mapcss
===================================================================
--- trunk/data/validator/deprecated.mapcss	(revision 15359)
+++ trunk/data/validator/deprecated.mapcss	(revision 15360)
@@ -1772,2 +1772,10 @@
   fixAdd: "crossing:island=yes";
 }
+
+/* #18152 */
+*[recycling:metal] {
+  throwWarning: tr("{0} is deprecated", "{0.key}");
+  suggestAlternative: "recycling:scrap_metal";
+  group: tr("deprecated tagging");
+  fixChangeKey: "recycling:metal => recycling:scrap_metal";
+}