Index: trunk/data/validator/deprecated.mapcss
===================================================================
--- trunk/data/validator/deprecated.mapcss	(revision 10272)
+++ trunk/data/validator/deprecated.mapcss	(revision 10329)
@@ -102,7 +102,6 @@
   /* from http://wiki.openstreetmap.org/wiki/Tag:shop=organic */
   throwWarning: tr("{0} is deprecated", "{0.tag}");
-  suggestAlternative: "shop=supermarket + organic=only";
-  fixAdd: "shop=supermarket";
-  fixAdd: "organic=only";
+  suggestAlternative: "shop=* + organic=yes";
+  suggestAlternative: "shop=* + organic=only";
 }