Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 8120)
+++ /trunk/data/defaultpresets.xml	(revision 8121)
@@ -178,5 +178,5 @@
     <chunk id="optional_sport">
         <optional text="Select sport:">
-            <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,handball,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" values_context="sport" />
+            <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,handball,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,soccer,swimming,table_tennis,tennis" values_context="sport" />
         </optional>
     </chunk>
@@ -4774,9 +4774,10 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Piste_Maps" />
             <space />
-            <key key="sport" value="skiing" />
-            <text key="name" text="Name" />
-            <combo key="piste:type" text="Piste type" values="downhill,nordic,skitour,snow_park" />
-            <combo key="piste:difficulty" text="Difficulty" values="novice,easy,intermediate,advanced,expert,freeride" values_context="piste:difficulty" values_searchable="true" />
-            <combo key="piste:grooming" text="Grooming" values="classic,mogul,skating,classic;skating,scooter,backcountry" values_context="piste:grooming" />
+            <text key="name" text="Name" />
+            <combo key="piste:type" text="Piste type" values="downhill,nordic,skitour,sled,sleigh,snow_park" match="keyvalue"/>
+            <optional>
+                <combo key="piste:difficulty" text="Difficulty" values="novice,easy,intermediate,advanced,expert,freeride" values_context="piste:difficulty" values_searchable="true" />
+                <combo key="piste:grooming" text="Grooming" values="classic,mogul,skating,classic;skating,scooter,backcountry" values_context="piste:grooming" />
+            </optional>
         </item> <!-- Skiing -->
         <item name="Shooting" icon="presets/range.png" type="node,closedway" preset_name_label="true">
Index: /trunk/data/validator/combinations.mapcss
===================================================================
--- /trunk/data/validator/combinations.mapcss	(revision 8120)
+++ /trunk/data/validator/combinations.mapcss	(revision 8121)
@@ -46,4 +46,5 @@
 *[border_type                  ][!boundary],
 *[bridge:structure             ][!bridge],
+*[piste:difficulty             ][!piste:type],
 *[source:date                  ][!source],
 *[source:name                  ][!name],
@@ -239,5 +240,5 @@
 
 /* see #9593, #11183 */
-*[sport][!building][tourism != hotel][highway != raceway][leisure !~ /^(sports_centre|stadium|track|pitch|golf_course|water_park|swimming_pool|recreation_ground)$/][natural !~ /^(beach|bare_rock|peak)$/][amenity !~ /^(pub|restaurant|swimming_pool)$/][landuse !~ /^(recreation_ground|piste|farm|farmland)$/][barrier !~ /^(wall|retaining_wall)$/] {
+*[sport][!building][tourism != hotel][highway != raceway][leisure !~ /^(sports_centre|stadium|track|pitch|golf_course|water_park|swimming_pool|recreation_ground)$/][natural !~ /^(beach|bare_rock|peak)$/][amenity !~ /^(pub|restaurant|swimming_pool)$/][landuse !~ /^(recreation_ground|piste|farm|farmland)$/][barrier !~ /^(wall|retaining_wall)$/][!"piste:type"] {
     throwWarning: tr("sport without physical feature");
     assertMatch: "node sport=tennis";
Index: /trunk/data/validator/deprecated.mapcss
===================================================================
--- /trunk/data/validator/deprecated.mapcss	(revision 8120)
+++ /trunk/data/validator/deprecated.mapcss	(revision 8121)
@@ -392,2 +392,8 @@
   throwWarning: tr("Unspecific tag {0}", "{0.tag}");
 }
+
+/* unclear definition, see #11183 */
+*[sport=skiing][!piste:type] {
+  throwWarning: tr("Definition of {0} is unclear", "{0.tag}");
+  suggestAlternative: {1.key};
+}
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 8120)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 8121)
@@ -1079,10 +1079,10 @@
     color: piste_novice#00ff00;
 }
-node[piste:difficulty=easy],
-node[piste:difficulty=intermediate],
-node[piste:difficulty=advanced],
-node[piste:difficulty=expert],
-node[piste:difficulty=freeride],
-node[piste:difficulty=novice] {
+node[piste:type=downhill],
+node[piste:type=nordic],
+node[piste:type=skitour],
+node[piste:type=sled],
+node[piste:type=sleigh],
+node[piste:type=snow_park] {
     icon-image: "sport/skiing.png";
     set icon_z17;
@@ -3725,14 +3725,8 @@
     text: auto;
 }
-area[sport=skiing],
 area[sport=table_tennis],
 area[sport=tennis],
 area[sport=paintball] {
     fill-color: sport#bde3cb;
-}
-node[sport=skiing] {
-    icon-image: "sport/skiing.png";
-    set icon_z17;
-    text: auto;
 }
 node[sport=table_tennis] {