Index: trunk/data/validator/deprecated.mapcss
===================================================================
--- trunk/data/validator/deprecated.mapcss	(revision 7923)
+++ trunk/data/validator/deprecated.mapcss	(revision 7924)
@@ -242,5 +242,5 @@
 }
 
-/* see #10107, #10108 - http://wiki.openstreetmap.org/wiki/Proposed_features/leaftype#Features.2FPages_affected */
+/* see #10107, #10108, #10929 - http://wiki.openstreetmap.org/wiki/Proposed_features/leaftype#Features.2FPages_affected */
 *[wood=deciduous],
 *[type=broad_leaved],
@@ -251,7 +251,9 @@
 }
 
-*[wood=coniferous] {
-  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
-  fixRemove: "wood";
+*[wood=coniferous],
+*[type=coniferous],
+*[type=conifer] {
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  fixRemove: "{0.key}";
   fixAdd: "leaf_type=needleleaved";
 }