Index: trunk/data/validator/deprecated.mapcss
===================================================================
--- trunk/data/validator/deprecated.mapcss	(revision 12916)
+++ trunk/data/validator/deprecated.mapcss	(revision 12930)
@@ -811,11 +811,10 @@
 }
 
-/* #11507, #12297 */
+/* #11507, #12297, #15409 */
 *[power=cable_distribution_cabinet] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
-  suggestAlternative: "man_made=street_cabinet + street_cabinet=power";
+  suggestAlternative: "man_made=street_cabinet + street_cabinet=*";
   group: tr("deprecated tagging");
   fixAdd: "man_made=street_cabinet";
-  fixAdd: "street_cabinet=power";
   fixRemove: "power";
 }