Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 9821)
+++ trunk/data/defaultpresets.xml	(revision 9835)
@@ -187,5 +187,5 @@
     </chunk>
     <chunk id="sport">
-            <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,beachvolleyball,billiards,boules,bowls,canadian_football,canoe,climbing,cricket,croquet,cycling,dog_racing,equestrian,field_hockey,gaelic_games,golf,gymnastics,handball,horse_racing,ice_hockey,karting,model_aerodrome,motocross,motor,pelota,racquet,rc_car,rugby_league,rugby_union,running,safety_training,shooting,skateboard,skating,soccer,swimming,table_tennis,tennis,volleyball,9pin,10pin" values_context="sport" />
+            <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,beachvolleyball,billiards,boules,bowls,canadian_football,canoe,climbing,cricket,croquet,cycling,dog_racing,equestrian,field_hockey,gaelic_games,golf,gymnastics,handball,horse_racing,ice_hockey,karting,model_aerodrome,motocross,motor,pelota,racquet,rc_car,rugby_league,rugby_union,running,safety_training,shooting,skateboard,ice_skating,roller_skating,soccer,swimming,table_tennis,tennis,volleyball,9pin,10pin" values_context="sport" />
     </chunk>
     <chunk id="fee">
@@ -5396,5 +5396,5 @@
             <key key="leisure" value="track" />
             <text key="name" text="Name" />
-            <combo key="sport" text="Sport" values="athletics,cycling,dog_racing,equestrian,horse_racing,running,skating" values_context="sport" />
+            <combo key="sport" text="Sport" values="athletics,cycling,dog_racing,equestrian,horse_racing,running,roller_skating,ice_skating" values_context="sport" />
         </item> <!-- Racetrack -->
         <group name="Golf" icon="styles/standard/sport/golf/golf.svg">
@@ -5635,12 +5635,18 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
         </item> <!-- Gymnastics -->
-        <item name="Skating" icon="presets/skating.png" type="node,closedway,multipolygon" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=skating"
-                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=skating" />
-            <space />
-            <key key="sport" value="skating" />
+        <item name="Ice Skating" icon="presets/skating.png" type="node,closedway,multipolygon" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=ice_skating" />
+            <space />
+            <key key="sport" value="ice_skating" />
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="ice_rink,pitch,sports_centre,stadium" default="ice_rink" />
-        </item> <!-- Skating -->
+        </item> <!-- Ice Skating -->
+        <item name="Roller Skating" icon="styles/standard/sport/roller_skating.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=roller_skating"/>
+            <space />
+            <key key="sport" value="roller_skating" />
+            <text key="name" text="Name" />
+            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
+        </item> <!-- Roller Skating -->
         <item name="Skateboard" icon="styles/standard/sport/skateboard.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=skateboard"
Index: trunk/data/validator/deprecated.mapcss
===================================================================
--- trunk/data/validator/deprecated.mapcss	(revision 9821)
+++ trunk/data/validator/deprecated.mapcss	(revision 9835)
@@ -792,2 +792,9 @@
   throwWarning: tr("questionable key (ending with a number): {0}", "{0.key}");
 }
+
+/* #12500 */
+*[sport=skating] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "sport=ice_skating";
+  suggestAlternative: "sport=roller_skating";
+}