Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 17468)
+++ trunk/resources/data/defaultpresets.xml	(revision 17469)
@@ -71,8 +71,9 @@
         <combo key="sidewalk" text="Sidewalk" values="both,left,right,no,separate" values_context="sidewalk" />
     </chunk>
-    <chunk id="placement">
+    <chunk id="placement_shoulder">
         <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,left_of:4,left_of:5,middle_of:1,middle_of:2,middle_of:3,middle_of:4,middle_of:5,right_of:1,right_of:2,right_of:3,right_of:4,right_of:5,transition" />
         <combo key="placement:forward" text="Placement in way direction" values="left_of:1,left_of:2,left_of:3,left_of:4,left_of:5,middle_of:1,middle_of:2,middle_of:3,middle_of:4,middle_of:5,right_of:1,right_of:2,right_of:3,right_of:4,right_of:5" />
         <combo key="placement:backward" text="Placement opposed to way direction" values="left_of:1,left_of:2,left_of:3,left_of:4,left_of:5,middle_of:1,middle_of:2,middle_of:3,middle_of:4,middle_of:5,right_of:1,right_of:2,right_of:3,right_of:4,right_of:5" />
+        <combo key="shoulder" text="Shoulder" values="yes,no,left,right,both" />
     </chunk>
     <chunk id="railway_service">
@@ -596,5 +597,5 @@
                     <check key="toll" text="Toll" />
                 </checkgroup>
-                <reference ref="placement" />
+                <reference ref="placement_shoulder" />
             </optional>
             <reference ref="link_road_access_restrictions" />
@@ -618,5 +619,5 @@
                     <check key="toll" text="Toll" />
                 </checkgroup>
-                <reference ref="placement" />
+                <reference ref="placement_shoulder" />
             </optional>
             <reference ref="link_road_access_restrictions" />
@@ -643,5 +644,5 @@
                     <check key="motorroad" text="Motorroad" default="on" />
                 </checkgroup>
-                <reference ref="placement" />
+                <reference ref="placement_shoulder" />
             </optional>
             <reference ref="link_road_access_restrictions" />
@@ -667,5 +668,5 @@
                     <check key="motorroad" text="Motorroad" default="on" />
                 </checkgroup>
-                <reference ref="placement" />
+                <reference ref="placement_shoulder" />
             </optional>
             <reference ref="link_road_access_restrictions" />
@@ -688,5 +689,5 @@
                     <check key="trolley_wire" text="Overhead trolley wires" />
                 </checkgroup>
-                <reference ref="placement" />
+                <reference ref="placement_shoulder" />
             </optional>
             <reference ref="link_road_access_restrictions" />
@@ -703,5 +704,5 @@
                 <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
                 <space />
-                <reference ref="placement" />
+                <reference ref="placement_shoulder" />
             </optional>
             <reference ref="link_road_access_restrictions" />
@@ -722,5 +723,5 @@
                     <check key="trolley_wire" text="Overhead trolley wires" />
                 </checkgroup>
-                <reference ref="placement" />
+                <reference ref="placement_shoulder" />
             </optional>
             <reference ref="link_road_access_restrictions" />
@@ -735,5 +736,5 @@
                 <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
                 <space />
-                <reference ref="placement" />
+                <reference ref="placement_shoulder" />
             </optional>
             <reference ref="link_road_access_restrictions" />
@@ -754,5 +755,5 @@
                     <check key="trolley_wire" text="Overhead trolley wires" />
                 </checkgroup>
-                <reference ref="placement" />
+                <reference ref="placement_shoulder" />
             </optional>
             <reference ref="link_road_access_restrictions" />
@@ -767,5 +768,5 @@
                 <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
                 <space />
-                <reference ref="placement" />
+                <reference ref="placement_shoulder" />
             </optional>
             <reference ref="link_road_access_restrictions" />
@@ -786,5 +787,5 @@
                     <check key="passing_places" text="Passing Places" />
                 </checkgroup> 
-                <reference ref="placement" />
+                <reference ref="placement_shoulder" />
             </optional>
             <reference ref="link_road_access_restrictions" />
Index: trunk/resources/data/validator/deprecated.mapcss
===================================================================
--- trunk/resources/data/validator/deprecated.mapcss	(revision 17468)
+++ trunk/resources/data/validator/deprecated.mapcss	(revision 17469)
@@ -2225,8 +2225,9 @@
 }
 
-/* #17498 */
+/* #17498, #20392 */
 way[cycleway=none],
 way[cycleway:left=none],
-way[cycleway:right=none] {
+way[cycleway:right=none],
+way[shoulder=none] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: concat("{0.key}", "=no");
Index: trunk/resources/data/validator/ignoretags.cfg
===================================================================
--- trunk/resources/data/validator/ignoretags.cfg	(revision 17468)
+++ trunk/resources/data/validator/ignoretags.cfg	(revision 17469)
@@ -703,4 +703,5 @@
 E:pk
 K:amenity=embassy
+K:shoulder=none
 ;
 ; Tags not yet decided (to remove from this section when added or moved up when deprecated)