diff --git a/config/debug/gdb.in b/config/debug/gdb.in
index b65a71b2..0d015831 100644
--- a/config/debug/gdb.in
+++ b/config/debug/gdb.in
@@ -97,12 +97,6 @@ choice
     prompt "gdb version"
     depends on GDB_CROSS || GDB_NATIVE || GDB_GDBSERVER
 
-config GDB_V_snapshot
-    bool
-    prompt "snapshot (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
-    depends on ! GDB_CROSS_INSIGHT
-
 config GDB_V_6_4
     bool
     prompt "6.4 (OBSOLETE)"
@@ -133,6 +127,13 @@ config GDB_V_6_8
 
 # CT_INSERT_VERSION_ABOVE
 # Don't remove above line!
+
+config GDB_V_snapshot
+    bool
+    prompt "snapshot (EXPERIMENTAL)"
+    depends on EXPERIMENTAL
+    depends on ! GDB_CROSS_INSIGHT
+
 endchoice
 
 config GDB_VERSION
diff --git a/config/libc/eglibc.in b/config/libc/eglibc.in
index 0a0a8b3e..bf0e4ed0 100644
--- a/config/libc/eglibc.in
+++ b/config/libc/eglibc.in
@@ -6,12 +6,6 @@ choice
     bool
     prompt "eglibc version"
 
-config EGLIBC_V_TRUNK
-    bool
-    prompt "'trunk'"
-    help
-      Selecting this will export the trunk of the eglibc subversion repository.
-
 config EGLIBC_V_2_5
     bool
     prompt "2.5"
@@ -30,6 +24,13 @@ config EGLIBC_V_2_8
 
 # CT_INSERT_VERSION_ABOVE
 # Don't remove above line!
+
+config EGLIBC_V_TRUNK
+    bool
+    prompt "'trunk'"
+    help
+      Selecting this will export the trunk of the eglibc subversion repository.
+
 endchoice
 
 config LIBC_VERSION
diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index 9b25f17d..250a56bc 100644
--- a/config/libc/glibc.in
+++ b/config/libc/glibc.in
@@ -6,16 +6,6 @@ choice
     bool
     prompt "glibc version"
 
-config LIBC_V_LATEST
-    bool
-    prompt "'latest' snapshot (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
-
-config LIBC_V_date
-    bool
-    prompt "<specific date> (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
-
 config LIBC_V_2_3_6
     bool
     prompt "2.3.6 (OBSOLETE)"
@@ -43,6 +33,17 @@ config LIBC_V_2_7
 
 # CT_INSERT_VERSION_ABOVE
 # Don't remove above line!
+
+config LIBC_V_LATEST
+    bool
+    prompt "'latest' snapshot (EXPERIMENTAL)"
+    depends on EXPERIMENTAL
+
+config LIBC_V_date
+    bool
+    prompt "<specific date> (EXPERIMENTAL)"
+    depends on EXPERIMENTAL
+
 endchoice
 
 config LIBC_VERSION
diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in
index 885cc827..a84fae26 100644
--- a/config/libc/uClibc.in
+++ b/config/libc/uClibc.in
@@ -6,16 +6,6 @@ choice
     bool
     prompt "uClibc version"
 
-config LIBC_V_snapshot
-    bool
-    prompt "latest snapshot (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
-
-config LIBC_V_specific_date
-    bool
-    prompt "<specific date> (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
-
 config LIBC_V_0_9_28
     bool
     prompt "0.9.28 (OBSOLETE)"
@@ -41,6 +31,17 @@ config LIBC_V_0_9_29
 
 # CT_INSERT_VERSION_ABOVE
 # Don't remove above line!
+
+config LIBC_V_snapshot
+    bool
+    prompt "latest snapshot (EXPERIMENTAL)"
+    depends on EXPERIMENTAL
+
+config LIBC_V_specific_date
+    bool
+    prompt "<specific date> (EXPERIMENTAL)"
+    depends on EXPERIMENTAL
+
 endchoice
 
 config LIBC_VERSION