Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 8876)
+++ trunk/data/defaultpresets.xml	(revision 8877)
@@ -18,5 +18,5 @@
     <chunk id="surface_smoothness">
         <reference ref="surface" />
-        <combo key="smoothness" text="Smoothness" values_searchable="true">
+        <combo key="smoothness" text="Smoothness" values_searchable="true" values_sort="false">
             <list_entry value="excellent" short_description="Thin Rollers: rollerblade, skateboard" />
             <list_entry value="good" short_description="Thin Wheels: racing bike" />
Index: trunk/data/tagging-preset.xsd
===================================================================
--- trunk/data/tagging-preset.xsd	(revision 8876)
+++ trunk/data/tagging-preset.xsd	(revision 8877)
@@ -205,4 +205,5 @@
 		<attribute name="values_context" type="string" />
 		<attribute name="values_no_i18n" type="boolean" />
+		<attribute name="values_sort" type="boolean" />
 		<attribute name="display_values" type="string" />
 		<attribute name="values_searchable" type="boolean" />
Index: trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java	(revision 8876)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java	(revision 8877)
@@ -99,4 +99,6 @@
     /** Disabled internationalisation for value to avoid mistakes, see #11696 */
     public boolean values_no_i18n;
+    /** Whether to sort the values, defaults to true. */
+    public boolean values_sort = true;
     public String display_values;
     /** The localized version of {@link #display_values}. */
@@ -425,5 +427,5 @@
         }
 
-        if (Main.pref.getBoolean("taggingpreset.sortvalues", true)) {
+        if (Main.pref.getBoolean("taggingpreset.sortvalues", true) && values_sort) {
             Collections.sort(entries);
         }