Index: trunk/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java	(revision 5079)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java	(revision 5080)
@@ -72,4 +72,9 @@
                 test("power_rating").
                 alternative("generator:output"));
+        // from http://wiki.openstreetmap.org/wiki/Tag:shop%3Dorganic
+        checks.add(new DeprecationCheck(2114).
+                testAndRemove("shop", "organic").
+                add("shop", "supermarket").
+                add("organic", "only"));
     }