21 files changed, 522 insertions, 539 deletions
diff --git a/config/binutils/binutils.in b/config/binutils/binutils.in
index 5473d84..9d506b5 100644
--- a/config/binutils/binutils.in
+++ b/config/binutils/binutils.in
@@ -8,47 +8,50 @@ config BINUTILS_VERSION
 choice
     bool
     prompt "binutils version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
 
-config BINUTILS_V_2_14
+config BINUTILS_V_2_19_51_0_2
     bool
-    prompt "2.14 (OBSOLETE)"
-    depends on OBSOLETE
+    prompt "2.19.51.0.2 (EXPERIMENTAL)"
+    depends on EXPERIMENTAL
 
-config BINUTILS_V_2_15
+config BINUTILS_V_2_19_51_0_1
     bool
-    prompt "2.15 (OBSOLETE)"
-    depends on OBSOLETE
+    prompt "2.19.51.0.1 (EXPERIMENTAL)"
+    depends on EXPERIMENTAL
 
-config BINUTILS_V_2_16_1
+config BINUTILS_V_2_19_50_0_1
     bool
-    prompt "2.16.1"
+    prompt "2.19.50.0.1 (EXPERIMENTAL)"
+    depends on EXPERIMENTAL
 
-config BINUTILS_V_2_17
+config BINUTILS_V_2_19_1
     bool
-    prompt "2.17"
+    prompt "2.19.1"
 
-config BINUTILS_V_2_18
+config BINUTILS_V_2_19
     bool
-    prompt "2.18"
+    prompt "2.19"
 
-config BINUTILS_V_2_18_50_0_4
+config BINUTILS_V_2_18_93
     bool
-    prompt "2.18.50.0.4 (EXPERIMENTAL)"
+    prompt "2.18.93 (EXPERIMENTAL)"
     depends on EXPERIMENTAL
 
-config BINUTILS_V_2_18_50_0_6
+config BINUTILS_V_2_18_92
     bool
-    prompt "2.18.50.0.6 (EXPERIMENTAL)"
+    prompt "2.18.92 (EXPERIMENTAL)"
     depends on EXPERIMENTAL
 
-config BINUTILS_V_2_18_50_0_7
+config BINUTILS_V_2_18_91
     bool
-    prompt "2.18.50.0.7 (EXPERIMENTAL)"
+    prompt "2.18.91 (EXPERIMENTAL)"
     depends on EXPERIMENTAL
 
-config BINUTILS_V_2_18_50_0_8
+config BINUTILS_V_2_18_90
     bool
-    prompt "2.18.50.0.8 (EXPERIMENTAL)"
+    prompt "2.18.90 (EXPERIMENTAL)"
     depends on EXPERIMENTAL
 
 config BINUTILS_V_2_18_50_0_9
@@ -56,76 +59,73 @@ config BINUTILS_V_2_18_50_0_9
     prompt "2.18.50.0.9 (EXPERIMENTAL)"
     depends on EXPERIMENTAL
 
-config BINUTILS_V_2_18_90
+config BINUTILS_V_2_18_50_0_8
     bool
-    prompt "2.18.90 (EXPERIMENTAL)"
+    prompt "2.18.50.0.8 (EXPERIMENTAL)"
     depends on EXPERIMENTAL
 
-config BINUTILS_V_2_18_91
+config BINUTILS_V_2_18_50_0_7
     bool
-    prompt "2.18.91 (EXPERIMENTAL)"
+    prompt "2.18.50.0.7 (EXPERIMENTAL)"
     depends on EXPERIMENTAL
 
-config BINUTILS_V_2_18_92
+config BINUTILS_V_2_18_50_0_6
     bool
-    prompt "2.18.92 (EXPERIMENTAL)"
+    prompt "2.18.50.0.6 (EXPERIMENTAL)"
     depends on EXPERIMENTAL
 
-config BINUTILS_V_2_18_93
+config BINUTILS_V_2_18_50_0_4
     bool
-    prompt "2.18.93 (EXPERIMENTAL)"
+    prompt "2.18.50.0.4 (EXPERIMENTAL)"
     depends on EXPERIMENTAL
 
-config BINUTILS_V_2_19
+config BINUTILS_V_2_18
     bool
-    prompt "2.19"
+    prompt "2.18"
 
-config BINUTILS_V_2_19_1
+config BINUTILS_V_2_17
     bool
-    prompt "2.19.1"
+    prompt "2.17"
 
-config BINUTILS_V_2_19_50_0_1
+config BINUTILS_V_2_16_1
     bool
-    prompt "2.19.50.0.1 (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
+    prompt "2.16.1"
 
-config BINUTILS_V_2_19_51_0_1
+config BINUTILS_V_2_15
     bool
-    prompt "2.19.51.0.1  (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
+    prompt "2.15 (OBSOLETE)"
+    depends on OBSOLETE
 
-config BINUTILS_V_2_19_51_0_2
+config BINUTILS_V_2_14
     bool
-    prompt "2.19.51.0.2  (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
+    prompt "2.14 (OBSOLETE)"
+    depends on OBSOLETE
 
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
 endchoice
 
 config BINUTILS_VERSION
     string
-    default "2.14" if BINUTILS_V_2_14
-    default "2.15" if BINUTILS_V_2_15
-    default "2.16.1" if BINUTILS_V_2_16_1
-    default "2.17" if BINUTILS_V_2_17
-    default "2.18" if BINUTILS_V_2_18
-    default "2.18.50.0.4" if BINUTILS_V_2_18_50_0_4
-    default "2.18.50.0.6" if BINUTILS_V_2_18_50_0_6
-    default "2.18.50.0.7" if BINUTILS_V_2_18_50_0_7
-    default "2.18.50.0.8" if BINUTILS_V_2_18_50_0_8
-    default "2.18.50.0.9" if BINUTILS_V_2_18_50_0_9
-    default "2.18.90" if BINUTILS_V_2_18_90
-    default "2.18.91" if BINUTILS_V_2_18_91
-    default "2.18.92" if BINUTILS_V_2_18_92
-    default "2.18.93" if BINUTILS_V_2_18_93
-    default "2.19" if BINUTILS_V_2_19
-    default "2.19.1" if BINUTILS_V_2_19_1
-    default "2.19.50.0.1" if BINUTILS_V_2_19_50_0_1
-    default "2.19.51.0.1" if BINUTILS_V_2_19_51_0_1
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
     default "2.19.51.0.2" if BINUTILS_V_2_19_51_0_2
-# CT_INSERT_VERSION_STRING_ABOVE
-# Don't remove above line!
+    default "2.19.51.0.1" if BINUTILS_V_2_19_51_0_1
+    default "2.19.50.0.1" if BINUTILS_V_2_19_50_0_1
+    default "2.19.1" if BINUTILS_V_2_19_1
+    default "2.19" if BINUTILS_V_2_19
+    default "2.18.93" if BINUTILS_V_2_18_93
+    default "2.18.92" if BINUTILS_V_2_18_92
+    default "2.18.91" if BINUTILS_V_2_18_91
+    default "2.18.90" if BINUTILS_V_2_18_90
+    default "2.18.50.0.9" if BINUTILS_V_2_18_50_0_9
+    default "2.18.50.0.8" if BINUTILS_V_2_18_50_0_8
+    default "2.18.50.0.7" if BINUTILS_V_2_18_50_0_7
+    default "2.18.50.0.6" if BINUTILS_V_2_18_50_0_6
+    default "2.18.50.0.4" if BINUTILS_V_2_18_50_0_4
+    default "2.18" if BINUTILS_V_2_18
+    default "2.17" if BINUTILS_V_2_17
+    default "2.16.1" if BINUTILS_V_2_16_1
+    default "2.15" if BINUTILS_V_2_15
+    default "2.14" if BINUTILS_V_2_14
 
 config BINUTILS_EXTRA_CONFIG
     string
diff --git a/config/binutils/elf2flt.in b/config/binutils/elf2flt.in
index 0b1ef72..c46e599 100644
--- a/config/binutils/elf2flt.in
+++ b/config/binutils/elf2flt.in
@@ -10,6 +10,8 @@ config ELF2FLT_VERSION
 choice
     bool
     prompt "elf2flt version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
 
 config ELF2FLT_CVSHEAD
     bool
@@ -21,8 +23,6 @@ config ELF2FLT_CVS_SNAPSHOT
     bool
     prompt "CVS Snapshot"
 
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
 endchoice
 
 config ELF2FLT_CVS_SNAPSHOT_SPEC
@@ -37,8 +37,8 @@ config ELF2FLT_CVS_SNAPSHOT_SPEC
 config ELF2FLT_VERSION
     string
     default "head" if ELF2FLT_CVSHEAD
-# CT_INSERT_VERSION_STRING_ABOVE
-# Don't remove above line!
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
 
 config ELF2FLT_EXTRA_CONFIG
     string
diff --git a/config/cc/gcc.in b/config/cc/gcc.in
index 1b09d54..d479272 100644
--- a/config/cc/gcc.in
+++ b/config/cc/gcc.in
@@ -16,122 +16,122 @@ config CC_gcc
 choice
     bool
     prompt "gcc version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
 
-config CC_V_3_2_3
+config CC_V_4_4_1
     bool
-    prompt "3.2.3 (OBSOLETE)"
-    depends on OBSOLETE
+    prompt "4.4.1 (EXPERIMENTAL)"
+    depends on EXPERIMENTAL
+    select CC_GCC_4_3_or_later
+    select CC_GCC_4_4_or_later
 
-config CC_V_3_3_6
+config CC_V_4_4_0
     bool
-    prompt "3.3.6 (OBSOLETE)"
-    depends on OBSOLETE
+    prompt "4.4.0 (EXPERIMENTAL)"
+    depends on EXPERIMENTAL
+    select CC_GCC_4_3_or_later
+    select CC_GCC_4_4_or_later
 
-config CC_V_3_4_6
+config CC_V_4_3_4
     bool
-    prompt "3.4.6 (OBSOLETE)"
-    depends on OBSOLETE
+    prompt "4.3.4"
+    select CC_GCC_4_3_or_later
 
-config CC_V_4_0_0
+config CC_V_4_3_3
     bool
-    prompt "4.0.0 (OBSOLETE)"
-    depends on OBSOLETE
+    prompt "4.3.3"
+    select CC_GCC_4_3_or_later
 
-config CC_V_4_0_1
+config CC_V_4_3_2
     bool
-    prompt "4.0.1 (OBSOLETE)"
-    depends on OBSOLETE
+    prompt "4.3.2"
+    select CC_GCC_4_3_or_later
 
-config CC_V_4_0_2
+config CC_V_4_3_1
     bool
-    prompt "4.0.2 (OBSOLETE)"
-    depends on OBSOLETE
+    prompt "4.3.1"
+    select CC_GCC_4_3_or_later
 
-config CC_V_4_0_3
+config CC_V_4_3_0
     bool
-    prompt "4.0.3 (OBSOLETE)"
-    depends on OBSOLETE
+    prompt "4.3.0 (EXPERIMENTAL)"
+    depends on EXPERIMENTAL
+    select CC_GCC_4_3_or_later
 
-config CC_V_4_0_4
+config CC_V_4_2_4
     bool
-    prompt "4.0.4"
+    prompt "4.2.4"
 
-config CC_V_4_1_0
+config CC_V_4_2_3
     bool
-    prompt "4.1.0 (OBSOLETE)"
-    depends on OBSOLETE
+    prompt "4.2.3"
 
-config CC_V_4_1_1
+config CC_V_4_2_2
     bool
-    prompt "4.1.1 (OBSOLETE)"
-    depends on OBSOLETE
+    prompt "4.2.2"
 
-config CC_V_4_1_2
+config CC_V_4_2_1
     bool
-    prompt "4.1.2"
+    prompt "4.2.1"
 
 config CC_V_4_2_0
     bool
     prompt "4.2.0"
 
-config CC_V_4_2_1
+config CC_V_4_1_2
     bool
-    prompt "4.2.1"
+    prompt "4.1.2"
 
-config CC_V_4_2_2
+config CC_V_4_1_1
     bool
-    prompt "4.2.2"
+    prompt "4.1.1 (OBSOLETE)"
+    depends on OBSOLETE
 
-config CC_V_4_2_3
+config CC_V_4_1_0
     bool
-    prompt "4.2.3"
+    prompt "4.1.0 (OBSOLETE)"
+    depends on OBSOLETE
 
-config CC_V_4_2_4
+config CC_V_4_0_4
     bool
-    prompt "4.2.4"
+    prompt "4.0.4"
 
-config CC_V_4_3_0
+config CC_V_4_0_3
     bool
-    prompt "4.3.0 (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
-    select CC_GCC_4_3_or_later
+    prompt "4.0.3 (OBSOLETE)"
+    depends on OBSOLETE
 
-config CC_V_4_3_1
+config CC_V_4_0_2
     bool
-    prompt "4.3.1"
-    select CC_GCC_4_3_or_later
+    prompt "4.0.2 (OBSOLETE)"
+    depends on OBSOLETE
 
-config CC_V_4_3_2
+config CC_V_4_0_1
     bool
-    prompt "4.3.2"
-    select CC_GCC_4_3_or_later
+    prompt "4.0.1 (OBSOLETE)"
+    depends on OBSOLETE
 
-config CC_V_4_3_3
+config CC_V_4_0_0
     bool
-    prompt "4.3.3"
-    select CC_GCC_4_3_or_later
+    prompt "4.0.0 (OBSOLETE)"
+    depends on OBSOLETE
 
-config CC_V_4_3_4
+config CC_V_3_4_6
     bool
-    prompt "4.3.4"
-    select CC_GCC_4_3_or_later
+    prompt "3.4.6 (OBSOLETE)"
+    depends on OBSOLETE
 
-config CC_V_4_4_0
+config CC_V_3_3_6
     bool
-    prompt "4.4.0 (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
-    select CC_GCC_4_3_or_later
-    select CC_GCC_4_4_or_later
+    prompt "3.3.6 (OBSOLETE)"
+    depends on OBSOLETE
 
-config CC_V_4_4_1
+config CC_V_3_2_3
     bool
-    prompt "4.4.1  (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
-    select CC_GCC_4_3_or_later
-    select CC_GCC_4_4_or_later
+    prompt "3.2.3 (OBSOLETE)"
+    depends on OBSOLETE
 
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
 endchoice
 
 config CC_GCC_4_3_or_later
@@ -146,31 +146,31 @@ config CC_GCC_4_4_or_later
 
 config CC_VERSION
     string
-    default "3.2.3" if CC_V_3_2_3
-    default "3.3.6" if CC_V_3_3_6
-    default "3.4.6" if CC_V_3_4_6
-    default "4.0.0" if CC_V_4_0_0
-    default "4.0.1" if CC_V_4_0_1
-    default "4.0.2" if CC_V_4_0_2
-    default "4.0.3" if CC_V_4_0_3
-    default "4.0.4" if CC_V_4_0_4
-    default "4.1.0" if CC_V_4_1_0
-    default "4.1.1" if CC_V_4_1_1
-    default "4.1.2" if CC_V_4_1_2
-    default "4.2.0" if CC_V_4_2_0
-    default "4.2.1" if CC_V_4_2_1
-    default "4.2.2" if CC_V_4_2_2
-    default "4.2.3" if CC_V_4_2_3
-    default "4.2.4" if CC_V_4_2_4
-    default "4.3.0" if CC_V_4_3_0
-    default "4.3.1" if CC_V_4_3_1
-    default "4.3.2" if CC_V_4_3_2
-    default "4.3.3" if CC_V_4_3_3
-    default "4.3.4" if CC_V_4_3_4
-    default "4.4.0" if CC_V_4_4_0
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
     default "4.4.1" if CC_V_4_4_1
-# CT_INSERT_VERSION_STRING_ABOVE
-# Don't remove above line!
+    default "4.4.0" if CC_V_4_4_0
+    default "4.3.4" if CC_V_4_3_4
+    default "4.3.3" if CC_V_4_3_3
+    default "4.3.2" if CC_V_4_3_2
+    default "4.3.1" if CC_V_4_3_1
+    default "4.3.0" if CC_V_4_3_0
+    default "4.2.4" if CC_V_4_2_4
+    default "4.2.3" if CC_V_4_2_3
+    default "4.2.2" if CC_V_4_2_2
+    default "4.2.1" if CC_V_4_2_1
+    default "4.2.0" if CC_V_4_2_0
+    default "4.1.2" if CC_V_4_1_2
+    default "4.1.1" if CC_V_4_1_1
+    default "4.1.0" if CC_V_4_1_0
+    default "4.0.4" if CC_V_4_0_4
+    default "4.0.3" if CC_V_4_0_3
+    default "4.0.2" if CC_V_4_0_2
+    default "4.0.1" if CC_V_4_0_1
+    default "4.0.0" if CC_V_4_0_0
+    default "3.4.6" if CC_V_3_4_6
+    default "3.3.6" if CC_V_3_3_6
+    default "3.2.3" if CC_V_3_2_3
 
 config CC_CXA_ATEXIT
     bool
diff --git a/config/companion_libs.in b/config/companion_libs.in
index aa4b63a..7437d1f 100644
--- a/config/companion_libs.in
+++ b/config/companion_libs.in
@@ -91,4 +91,35 @@ config COMP_LIBS_TARGET
       
       Please note that for now, crosstool-NG can only build GMP and MPFR so.
 
+choice
+    bool
+    prompt "|  Install tools wrapper as:"
+    depends on WRAPPER_NEEDED
+    default TOOLS_WRAPPER_SHELL
+
+config TOOLS_WRAPPER_SCRIPT
+    bool
+    prompt "shell script"
+    help
+      If your host has a shell, then you should say 'Y' here, to use
+      a (very very simple) shell script as wrapper.
+      
+      See docs/overview.txt, section "Tools wrapper".
+
+config TOOLS_WRAPPER_EXEC
+    bool
+    prompt "executable"
+    help
+      If your host lacks a shell, then you should say 'Y' here, to use
+      an executable.
+      
+      See docs/overview.txt, section "Tools wrapper".
+
+endchoice
+
+config TOOLS_WRAPPER
+    string
+    default "script" if TOOLS_WRAPPER_SCRIPT
+    default "exec"   if TOOLS_WRAPPER_EXEC
+
 endmenu
diff --git a/config/companion_libs/cloog.in b/config/companion_libs/cloog.in
index 99779c9..75ddb14 100644
--- a/config/companion_libs/cloog.in
+++ b/config/companion_libs/cloog.in
@@ -3,17 +3,37 @@
 choice
     bool
     prompt "CLooG/ppl version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
+
+config CLOOG_V_0_15_7
+    bool
+    prompt "0.15.7"
+
+config CLOOG_V_0_15_6
+    bool
+    prompt "0.15.6"
+
+config CLOOG_V_0_15_5
+    bool
+    prompt "0.15.5"
+
+config CLOOG_V_0_15_4
+    bool
+    prompt "0.15.4"
 
 config CLOOG_V_0_15_3
     bool
     prompt "0.15.3"
 
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
 endchoice
 
 config CLOOG_VERSION
     string
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
+    default "0.15.7" if CLOOG_V_0_15_7
+    default "0.15.6" if CLOOG_V_0_15_6
+    default "0.15.5" if CLOOG_V_0_15_5
+    default "0.15.4" if CLOOG_V_0_15_4
     default "0.15.3" if CLOOG_V_0_15_3
-# CT_INSERT_VERSION_STRING_ABOVE
-# Don't remove above line!
diff --git a/config/companion_libs/gmp.in b/config/companion_libs/gmp.in
index a87f417..75628d9 100644
--- a/config/companion_libs/gmp.in
+++ b/config/companion_libs/gmp.in
@@ -3,32 +3,32 @@
 choice
     bool
     prompt "GMP version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
 
-config GMP_V_4_2_2
-    bool
-    prompt "4.2.2"
-
-config GMP_V_4_2_4
+config GMP_V_4_3_1
     bool
-    prompt "4.2.4"
+    prompt "4.3.1"
 
 config GMP_V_4_3_0
     bool
     prompt "4.3.0"
 
-config GMP_V_4_3_1
+config GMP_V_4_2_4
     bool
-    prompt "4.3.1"
+    prompt "4.2.4"
+
+config GMP_V_4_2_2
+    bool
+    prompt "4.2.2"
 
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
 endchoice
 
 config GMP_VERSION
     string
-    default "4.2.2" if GMP_V_4_2_2
-    default "4.2.4" if GMP_V_4_2_4
-    default "4.3.0" if GMP_V_4_3_0
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
     default "4.3.1" if GMP_V_4_3_1
-# CT_INSERT_VERSION_STRING_ABOVE
-# Don't remove above line!
+    default "4.3.0" if GMP_V_4_3_0
+    default "4.2.4" if GMP_V_4_2_4
+    default "4.2.2" if GMP_V_4_2_2
diff --git a/config/companion_libs/mpc.in b/config/companion_libs/mpc.in
index 0aa1369..27e9b90 100644
--- a/config/companion_libs/mpc.in
+++ b/config/companion_libs/mpc.in
@@ -3,17 +3,22 @@
 choice
     bool
     prompt "MPC version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
+
+config MPC_V_0_7
+    bool
+    prompt "0.7"
 
 config MPC_V_0_6
     bool
     prompt "0.6"
 
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
 endchoice
 
 config MPC_VERSION
     string
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
+    default "0.7" if MPC_V_0_7
     default "0.6" if MPC_V_0_6
-# CT_INSERT_VERSION_STRING_ABOVE
-# Don't remove above line!
diff --git a/config/companion_libs/mpfr.in b/config/companion_libs/mpfr.in
index 910ab4e..61f057a 100644
--- a/config/companion_libs/mpfr.in
+++ b/config/companion_libs/mpfr.in
@@ -3,32 +3,32 @@
 choice
     bool
     prompt "MPFR version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
 
-config MPFR_V_2_3_1
-    bool
-    prompt "2.3.1"
-
-config MPFR_V_2_3_2
+config MPFR_V_2_4_1
     bool
-    prompt "2.3.2"
+    prompt "2.4.1"
 
 config MPFR_V_2_4_0
     bool
     prompt "2.4.0"
 
-config MPFR_V_2_4_1
+config MPFR_V_2_3_2
     bool
-    prompt "2.4.1"
+    prompt "2.3.2"
+
+config MPFR_V_2_3_1
+    bool
+    prompt "2.3.1"
 
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
 endchoice
 
 config MPFR_VERSION
     string
-    default "2.3.1" if MPFR_V_2_3_1
-    default "2.3.2" if MPFR_V_2_3_2
-    default "2.4.0" if MPFR_V_2_4_0
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
     default "2.4.1" if MPFR_V_2_4_1
-# CT_INSERT_VERSION_STRING_ABOVE
-# Don't remove above line!
+    default "2.4.0" if MPFR_V_2_4_0
+    default "2.3.2" if MPFR_V_2_3_2
+    default "2.3.1" if MPFR_V_2_3_1
diff --git a/config/companion_libs/ppl.in b/config/companion_libs/ppl.in
index efdeabf..8f32570 100644
--- a/config/companion_libs/ppl.in
+++ b/config/companion_libs/ppl.in
@@ -3,17 +3,17 @@
 choice
     bool
     prompt "PPL version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
 
 config PPL_V_0_10_2
     bool
     prompt "0.10.2"
 
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
 endchoice
 
 config PPL_VERSION
     string
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
     default "0.10.2" if PPL_V_0_10_2
-# CT_INSERT_VERSION_STRING_ABOVE
-# Don't remove above line!
diff --git a/config/debug/dmalloc.in b/config/debug/dmalloc.in
index 7f4751f..7e026d0 100644
--- a/config/debug/dmalloc.in
+++ b/config/debug/dmalloc.in
@@ -6,23 +6,23 @@ config DEBUG_dmalloc
 choice
     bool
     prompt "dmalloc version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
+
+config DMALLOC_V_5_5_2
+    bool
+    prompt "5.5.2"
 
 config DMALLOC_V_5_4_3
     bool
     prompt "5.4.3 (OBSOLETE)"
     depends on OBSOLETE
 
-config DMALLOC_V_5_5_2
-    bool
-    prompt "5.5.2"
-
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
 endchoice
 
 config DMALLOC_VERSION
     string
-    default "5.4.3" if DMALLOC_V_5_4_3
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
     default "5.5.2" if DMALLOC_V_5_5_2
-# CT_INSERT_VERSION_STRING_ABOVE
-# Don't remove above line!
+    default "5.4.3" if DMALLOC_V_5_4_3
diff --git a/config/debug/duma.in b/config/debug/duma.in
index 987be65..0afb5b8 100644
--- a/config/debug/duma.in
+++ b/config/debug/duma.in
@@ -20,37 +20,37 @@ config DUMA_SO
 choice
     bool
     prompt "D.U.M.A. version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
 
-config DUMA_V_2_5_1
+config DUMA_V_2_5_15
     bool
-    prompt "2_5_1"
+    prompt "2_5_15"
 
-config DUMA_V_2_5_8
+config DUMA_V_2_5_14
     bool
-    prompt "2_5_8"
+    prompt "2_5_14"
 
 config DUMA_V_2_5_12
     bool
     prompt "2_5_12"
 
-config DUMA_V_2_5_14
+config DUMA_V_2_5_8
     bool
-    prompt "2_5_14"
+    prompt "2_5_8"
 
-config DUMA_V_2_5_15
+config DUMA_V_2_5_1
     bool
-    prompt "2_5_15"
+    prompt "2_5_1"
 
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
 endchoice
 
 config DUMA_VERSION
     string
-    default "2_5_1" if DUMA_V_2_5_1
-    default "2_5_8" if DUMA_V_2_5_8
-    default "2_5_12" if DUMA_V_2_5_12
-    default "2_5_14" if DUMA_V_2_5_14
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
     default "2_5_15" if DUMA_V_2_5_15
-# CT_INSERT_VERSION_STRING_ABOVE
-# Don't remove above line!
+    default "2_5_14" if DUMA_V_2_5_14
+    default "2_5_12" if DUMA_V_2_5_12
+    default "2_5_8" if DUMA_V_2_5_8
+    default "2_5_1" if DUMA_V_2_5_1
diff --git a/config/debug/gdb.in b/config/debug/gdb.in
index f21123d..b567335 100644
--- a/config/debug/gdb.in
+++ b/config/debug/gdb.in
@@ -96,37 +96,36 @@ choice
     bool
     prompt "gdb version"
     depends on GDB_CROSS || GDB_NATIVE || GDB_GDBSERVER
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
 
-config GDB_V_6_4
-    bool
-    prompt "6.4 (OBSOLETE)"
-    depends on OBSOLETE
-
-config GDB_V_6_5
+config GDB_V_6_8
     bool
-    prompt "6.5 (OBSOLETE)"
-    depends on OBSOLETE
+    prompt "6.8"
 
-config GDB_V_6_6
+config GDB_V_6_7_1
     bool
-    prompt "6.6"
+    prompt "6.7.1 (EXPERIMENTAL)"
+    depends on EXPERIMENTAL
 
 config GDB_V_6_7
     bool
     prompt "6.7 (EXPERIMENTAL)"
     depends on EXPERIMENTAL
 
-config GDB_V_6_7_1
+config GDB_V_6_6
     bool
-    prompt "6.7.1 (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
+    prompt "6.6"
 
-config GDB_V_6_8
+config GDB_V_6_5
     bool
-    prompt "6.8"
+    prompt "6.5 (OBSOLETE)"
+    depends on OBSOLETE
 
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
+config GDB_V_6_4
+    bool
+    prompt "6.4 (OBSOLETE)"
+    depends on OBSOLETE
 
 config GDB_V_snapshot
     bool
@@ -138,15 +137,15 @@ endchoice
 
 config GDB_VERSION
     string
-    default "snapshot" if GDB_V_snapshot
-    default "6.4" if GDB_V_6_4
-    default "6.5" if GDB_V_6_5
-    default "6.6" if GDB_V_6_6
-    default "6.7" if GDB_V_6_7
-    default "6.7.1" if GDB_V_6_7_1
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
     default "6.8" if GDB_V_6_8
-# CT_INSERT_VERSION_STRING_ABOVE
-# Don't remove above line!
+    default "6.7.1" if GDB_V_6_7_1
+    default "6.7" if GDB_V_6_7
+    default "6.6" if GDB_V_6_6
+    default "6.5" if GDB_V_6_5
+    default "6.4" if GDB_V_6_4
+    default "snapshot" if GDB_V_snapshot
 
 if GDB_NATIVE
 
@@ -156,19 +155,19 @@ choice
     bool
     prompt "ncurses version"
 
-config NCURSES_V_5_6
-    bool
-    prompt "5.6"
-
 config NCURSES_V_5_7
     bool
     prompt "5.7"
 
+config NCURSES_V_5_6
+    bool
+    prompt "5.6"
+
 endchoice
 
 config NCURSES_VERSION
     string
-    default "5.6" if NCURSES_V_5_6
     default "5.7" if NCURSES_V_5_7
+    default "5.6" if NCURSES_V_5_6
 
 endif # GDB_NATIVE --> ncurses
diff --git a/config/debug/ltrace.in b/config/debug/ltrace.in
index 4b141e0..50d365d 100644
--- a/config/debug/ltrace.in
+++ b/config/debug/ltrace.in
@@ -11,33 +11,33 @@ config DEBUG_ltrace
 choice
     bool
     prompt "ltrace version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
 
-config LTRACE_V_0_4
-    bool
-    prompt "0.4"
-
-config LTRACE_V_0_5
+config LTRACE_V_0_5_2
     bool
-    prompt "0.5"
+    prompt "0.5.2"
 
 config LTRACE_V_0_5_1
     bool
-    prompt "0.5.1  (EXPERIMENTAL)"
+    prompt "0.5.1 (EXPERIMENTAL)"
     depends on EXPERIMENTAL
 
-config LTRACE_V_0_5_2
+config LTRACE_V_0_5
     bool
-    prompt "0.5.2"
+    prompt "0.5"
+
+config LTRACE_V_0_4
+    bool
+    prompt "0.4"
 
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
 endchoice
 
 config LTRACE_VERSION
     string
-    default "0.4" if LTRACE_V_0_4
-    default "0.5" if LTRACE_V_0_5
-    default "0.5.1" if LTRACE_V_0_5_1
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
     default "0.5.2" if LTRACE_V_0_5_2
-# CT_INSERT_VERSION_STRING_ABOVE
-# # Don't remove above line!
+    default "0.5.1" if LTRACE_V_0_5_1
+    default "0.5" if LTRACE_V_0_5
+    default "0.4" if LTRACE_V_0_4
diff --git a/config/debug/strace.in b/config/debug/strace.in
index eae6d01..4fcaa73 100644
--- a/config/debug/strace.in
+++ b/config/debug/strace.in
@@ -5,45 +5,45 @@ config DEBUG_strace
 choice
     bool
     prompt "strace version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
 
-config STRACE_V_4_5
-    bool
-    prompt "4.5 (OBSOLETE)"
-    depends on OBSOLETE
-
-config STRACE_V_4_5_14
+config STRACE_V_4_5_18
     bool
-    prompt "4.5.14 (OBSOLETE)"
-    depends on OBSOLETE
+    prompt "4.5.18 (EXPERIMENTAL)"
+    depends on EXPERIMENTAL
 
-config STRACE_V_4_5_15
+config STRACE_V_4_5_17
     bool
-    prompt "4.5.15"
+    prompt "4.5.17"
 
 config STRACE_V_4_5_16
     bool
     prompt "4.5.16"
 
-config STRACE_V_4_5_17
+config STRACE_V_4_5_15
     bool
-    prompt "4.5.17"
+    prompt "4.5.15"
 
-config STRACE_V_4_5_18
+config STRACE_V_4_5_14
     bool
-    prompt "4.5.18 (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
+    prompt "4.5.14 (OBSOLETE)"
+    depends on OBSOLETE
+
+config STRACE_V_4_5
+    bool
+    prompt "4.5 (OBSOLETE)"
+    depends on OBSOLETE
 
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
 endchoice
 
 config STRACE_VERSION
     string
-    default "4.5" if STRACE_V_4_5
-    default "4.5.14" if STRACE_V_4_5_14
-    default "4.5.15" if STRACE_V_4_5_15
-    default "4.5.16" if STRACE_V_4_5_16
-    default "4.5.17" if STRACE_V_4_5_17
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
     default "4.5.18" if STRACE_V_4_5_18
-# CT_INSERT_VERSION_STRING_ABOVE
-# # Don't remove above line!
+    default "4.5.17" if STRACE_V_4_5_17
+    default "4.5.16" if STRACE_V_4_5_16
+    default "4.5.15" if STRACE_V_4_5_15
+    default "4.5.14" if STRACE_V_4_5_14
+    default "4.5" if STRACE_V_4_5
diff --git a/config/kernel/linux.in b/config/kernel/linux.in
index 12ae5a5..34c5422 100644
--- a/config/kernel/linux.in
+++ b/config/kernel/linux.in
@@ -31,114 +31,109 @@ config KERNEL_LINUX_INSTALL_CHECK
 choice
     bool
     prompt "Linux kernel version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
 
-config KERNEL_V_2_6_18_8
+config KERNEL_V_2_6_31_1
     bool
-    prompt "2.6.18.8 (OBSOLETE)"
-    depends on OBSOLETE
+    prompt "2.6.31.1"
 
-config KERNEL_V_2_6_19_7
+config KERNEL_V_2_6_31
     bool
-    prompt "2.6.19.7 (OBSOLETE)"
-    depends on OBSOLETE
+    prompt "2.6.31"
 
-config KERNEL_V_2_6_20_21
+config KERNEL_V_3_6_30_8
     bool
-    prompt "2.6.20.21 (OBSOLETE)"
-    depends on OBSOLETE
+    prompt "3.6.30.8"
 
-config KERNEL_V_2_6_21_7
+config KERNEL_V_3_6_30_7
     bool
-    prompt "2.6.21.7 (OBSOLETE)"
-    depends on OBSOLETE
+    prompt "3.6.30.7"
 
-config KERNEL_V_2_6_22_19
+config KERNEL_V_2_6_30_6
     bool
-    prompt "2.6.22.19 (OBSOLETE)"
-    depends on OBSOLETE
+    prompt "2.6.30.6"
 
-config KERNEL_V_2_6_23_17
-    bool
-    prompt "2.6.23.17 (OBSOLETE)"
-    depends on OBSOLETE
-
-config KERNEL_V_2_6_24_7
+config KERNEL_V_2_6_30_5
     bool
-    prompt "2.6.24.7 (OBSOLETE)"
-    depends on OBSOLETE
+    prompt "2.6.30.5"
 
-config KERNEL_V_2_6_25_20
+config KERNEL_V_2_6_30_4
     bool
-    prompt "2.6.25.20 (OBSOLETE)"
-    depends on OBSOLETE
+    prompt "2.6.30.4"
 
-config KERNEL_V_2_6_26_8
+config KERNEL_V_2_6_30_3
     bool
-    prompt "2.6.26.8 (OBSOLETE)"
-    depends on OBSOLETE
+    prompt "2.6.30.3"
 
-config KERNEL_V_2_6_27_31
+config KERNEL_V_2_6_30_2
     bool
-    prompt "2.6.27.31 (long-term stable)"
+    prompt "2.6.30.2"
 
-config KERNEL_V_2_6_28_10
+config KERNEL_V_2_6_30_1
     bool
-    prompt "2.6.28.10"
+    prompt "2.6.30.1"
 
-config KERNEL_V_2_6_29
+config KERNEL_V_2_6_30
     bool
-    prompt "2.6.29"
+    prompt "2.6.30"
 
-config KERNEL_V_2_6_29_1
+config KERNEL_V_2_6_29_6
     bool
-    prompt "2.6.29.1"
+    prompt "2.6.29.6"
 
-config KERNEL_V_2_6_29_2
+config KERNEL_V_2_6_28_10
     bool
-    prompt "2.6.29.2"
+    prompt "2.6.28.10"
 
-config KERNEL_V_2_6_29_3
+config KERNEL_V_2_6_27_35
     bool
-    prompt "2.6.29.3"
+    prompt "2.6.27.35 (long-term stable)"
 
-config KERNEL_V_2_6_29_4
+config KERNEL_V_2_6_26_8
     bool
-    prompt "2.6.29.4"
+    prompt "2.6.26.8 (OBSOLETE)"
+    depends on OBSOLETE
 
-config KERNEL_V_2_6_29_5
+config KERNEL_V_2_6_25_20
     bool
-    prompt "2.6.29.5"
+    prompt "2.6.25.20 (OBSOLETE)"
+    depends on OBSOLETE
 
-config KERNEL_V_2_6_29_6
+config KERNEL_V_2_6_24_7
     bool
-    prompt "2.6.29.6"
+    prompt "2.6.24.7 (OBSOLETE)"
+    depends on OBSOLETE
 
-config KERNEL_V_2_6_30
+config KERNEL_V_2_6_23_17
     bool
-    prompt "2.6.30"
+    prompt "2.6.23.17 (OBSOLETE)"
+    depends on OBSOLETE
 
-config KERNEL_V_2_6_30_1
+config KERNEL_V_2_6_22_19
     bool
-    prompt "2.6.30.1"
+    prompt "2.6.22.19 (OBSOLETE)"
+    depends on OBSOLETE
 
-config KERNEL_V_2_6_30_2
+config KERNEL_V_2_6_21_7
     bool
-    prompt "2.6.30.2"
+    prompt "2.6.21.7 (OBSOLETE)"
+    depends on OBSOLETE
 
-config KERNEL_V_2_6_30_3
+config KERNEL_V_2_6_20_21
     bool
-    prompt "2.6.30.3"
+    prompt "2.6.20.21 (OBSOLETE)"
+    depends on OBSOLETE
 
-config KERNEL_V_2_6_30_4
+config KERNEL_V_2_6_19_7
     bool
-    prompt "2.6.30.4"
+    prompt "2.6.19.7 (OBSOLETE)"
+    depends on OBSOLETE
 
-config KERNEL_V_2_6_30_5
+config KERNEL_V_2_6_18_8
     bool
-    prompt "2.6.30.5"
-
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
+    prompt "2.6.18.8 (OBSOLETE)"
+    depends on OBSOLETE
 
 config KERNEL_V_select
     bool
@@ -150,32 +145,32 @@ endchoice
 config KERNEL_VERSION
     string
     prompt "Kernel version" if KERNEL_V_select
-    default "2.6.18.8" if KERNEL_V_2_6_18_8
-    default "2.6.19.7" if KERNEL_V_2_6_19_7
-    default "2.6.20.21" if KERNEL_V_2_6_20_21
-    default "2.6.21.7" if KERNEL_V_2_6_21_7
-    default "2.6.22.19" if KERNEL_V_2_6_22_19
-    default "2.6.23.17" if KERNEL_V_2_6_23_17
-    default "2.6.24.7" if KERNEL_V_2_6_24_7
-    default "2.6.25.20" if KERNEL_V_2_6_25_20
-    default "2.6.26.8" if KERNEL_V_2_6_26_8
-    default "2.6.27.31" if KERNEL_V_2_6_27_31
-    default "2.6.28.10" if KERNEL_V_2_6_28_10
-    default "2.6.29" if KERNEL_V_2_6_29
-    default "2.6.29.1" if KERNEL_V_2_6_29_1
-    default "2.6.29.2" if KERNEL_V_2_6_29_2
-    default "2.6.29.3" if KERNEL_V_2_6_29_3
-    default "2.6.29.4" if KERNEL_V_2_6_29_4
-    default "2.6.29.5" if KERNEL_V_2_6_29_5
-    default "2.6.29.6" if KERNEL_V_2_6_29_6
-    default "2.6.30" if KERNEL_V_2_6_30
-    default "2.6.30.1" if KERNEL_V_2_6_30_1
-    default "2.6.30.2" if KERNEL_V_2_6_30_2
-    default "2.6.30.3" if KERNEL_V_2_6_30_3
-    default "2.6.30.4" if KERNEL_V_2_6_30_4
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
+    default "2.6.31.1" if KERNEL_V_2_6_31_1
+    default "2.6.31" if KERNEL_V_2_6_31
+    default "3.6.30.8" if KERNEL_V_3_6_30_8
+    default "3.6.30.7" if KERNEL_V_3_6_30_7
+    default "2.6.30.6" if KERNEL_V_2_6_30_6
     default "2.6.30.5" if KERNEL_V_2_6_30_5
-# CT_INSERT_VERSION_STRING_ABOVE
-# Don't remove above line!
+    default "2.6.30.4" if KERNEL_V_2_6_30_4
+    default "2.6.30.3" if KERNEL_V_2_6_30_3
+    default "2.6.30.2" if KERNEL_V_2_6_30_2
+    default "2.6.30.1" if KERNEL_V_2_6_30_1
+    default "2.6.30" if KERNEL_V_2_6_30
+    default "2.6.29.6" if KERNEL_V_2_6_29_6
+    default "2.6.29" if KERNEL_V_2_6_29
+    default "2.6.28.10" if KERNEL_V_2_6_28_10
+    default "2.6.27.35" if KERNEL_V_2_6_27_35
+    default "2.6.26.8" if KERNEL_V_2_6_26_8
+    default "2.6.25.20" if KERNEL_V_2_6_25_20
+    default "2.6.24.7" if KERNEL_V_2_6_24_7
+    default "2.6.23.17" if KERNEL_V_2_6_23_17
+    default "2.6.22.19" if KERNEL_V_2_6_22_19
+    default "2.6.21.7" if KERNEL_V_2_6_21_7
+    default "2.6.20.21" if KERNEL_V_2_6_20_21
+    default "2.6.19.7" if KERNEL_V_2_6_19_7
+    default "2.6.18.8" if KERNEL_V_2_6_18_8
     help
       Enter here the kernel version you want to use, if it is
       not listed above. Something like V.P.S or V.P.S.E, where:
diff --git a/config/libc/eglibc.in b/config/libc/eglibc.in
index ced8d95..c507a47 100644
--- a/config/libc/eglibc.in
+++ b/config/libc/eglibc.in
@@ -15,33 +15,32 @@ config LIBC_eglibc
 choice
     bool
     prompt "eglibc version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
 
-config EGLIBC_V_2_5
-    bool
-    prompt "2_5"
-
-config EGLIBC_V_2_6
+config LIBC_V_2_10
     bool
-    prompt "2_6"
+    prompt "2_10"
 
-config EGLIBC_V_2_7
+config EGLIBC_V_2_9
     bool
-    prompt "2_7"
+    prompt "2_9"
 
 config EGLIBC_V_2_8
     bool
     prompt "2_8"
 
-config EGLIBC_V_2_9
+config EGLIBC_V_2_7
     bool
-    prompt "2_9"
+    prompt "2_7"
 
-config LIBC_V_2_10
+config EGLIBC_V_2_6
     bool
-    prompt "2_10"
+    prompt "2_6"
 
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
+config EGLIBC_V_2_5
+    bool
+    prompt "2_5"
 
 config EGLIBC_V_TRUNK
     bool
@@ -53,15 +52,15 @@ endchoice
 
 config LIBC_VERSION
     string
-    default "trunk" if EGLIBC_V_TRUNK
-    default "2_5" if EGLIBC_V_2_5
-    default "2_6" if EGLIBC_V_2_6
-    default "2_7" if EGLIBC_V_2_7
-    default "2_8" if EGLIBC_V_2_8
-    default "2_9" if EGLIBC_V_2_9
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
     default "2_10" if LIBC_V_2_10
-# CT_INSERT_VERSION_STRING_ABOVE
-# Don't remove above line!
+    default "2_9" if EGLIBC_V_2_9
+    default "2_8" if EGLIBC_V_2_8
+    default "2_7" if EGLIBC_V_2_7
+    default "2_6" if EGLIBC_V_2_6
+    default "2_5" if EGLIBC_V_2_5
+    default "trunk" if EGLIBC_V_TRUNK
 
 config EGLIBC_REVISION
     string
diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index b9ef99f..777657c 100644
--- a/config/libc/glibc.in
+++ b/config/libc/glibc.in
@@ -11,72 +11,58 @@ config LIBC_glibc
 choice
     bool
     prompt "glibc version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
 
-config LIBC_V_2_3_6
-    bool
-    prompt "2.3.6 (OBSOLETE)"
-    depends on OBSOLETE
-
-config LIBC_V_2_5
+config LIBC_V_2_9
     bool
-    prompt "2.5"
+    prompt "2.9"
+    select LIBC_GLIBC_2_8_or_later
 
-config LIBC_V_2_5_1
+config LIBC_V_2_8
     bool
-    prompt "2.5.1"
+    prompt "2.8"
+    select LIBC_GLIBC_2_8_or_later
 
-config LIBC_V_2_6
+config LIBC_V_2_7
     bool
-    prompt "2.6"
+    prompt "2.7"
 
 config LIBC_V_2_6_1
     bool
     prompt "2.6.1"
 
-config LIBC_V_2_7
-    bool
-    prompt "2.7"
-
-config LIBC_V_2_8
+config LIBC_V_2_6
     bool
-    prompt "2.8"
-    select LIBC_GLIBC_2_8_or_later
+    prompt "2.6"
 
-config LIBC_V_2_9
+config LIBC_V_2_5_1
     bool
-    prompt "2.9"
-    select LIBC_GLIBC_2_8_or_later
-
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
+    prompt "2.5.1"
 
-config LIBC_V_LATEST
+config LIBC_V_2_5
     bool
-    prompt "'latest' snapshot (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
+    prompt "2.5"
 
-config LIBC_V_date
+config LIBC_V_2_3_6
     bool
-    prompt "<specific date> (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
+    prompt "2.3.6 (OBSOLETE)"
+    depends on OBSOLETE
 
 endchoice
 
 config LIBC_VERSION
     string
-    prompt "Enter date (YYYYMMDD)" if LIBC_V_date
-    default "latest" if LIBC_V_LATEST
-    default "2.3.6" if LIBC_V_2_3_6
-    default "2.4" if LIBC_V_2_4
-    default "2.5" if LIBC_V_2_5
-    default "2.5.1" if LIBC_V_2_5_1
-    default "2.6" if LIBC_V_2_6
-    default "2.6.1" if LIBC_V_2_6_1
-    default "2.7" if LIBC_V_2_7
-    default "2.8" if LIBC_V_2_8
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
     default "2.9" if LIBC_V_2_9
-# CT_INSERT_VERSION_STRING_ABOVE
-# Don't remove above line!
+    default "2.8" if LIBC_V_2_8
+    default "2.7" if LIBC_V_2_7
+    default "2.6.1" if LIBC_V_2_6_1
+    default "2.6" if LIBC_V_2_6
+    default "2.5.1" if LIBC_V_2_5_1
+    default "2.5" if LIBC_V_2_5
+    default "2.3.6" if LIBC_V_2_3_6
 
 config LIBC_GLIBC_2_8_or_later
     bool
@@ -130,14 +116,4 @@ config LIBC_GLIBC_CVS_date
 
 endif #  LIBC_GLIBC_CVS
 
-#config LIBC_GLIBC_SNAPSHOT
-#    bool
-#    prompt "Use latest nightly snapshot"
-#    help
-#      See the help for the entry "Released tarball", above.
-#      
-#      If you can live with a moving code-base, say 'Y' here.
-#      If you want your toolchain to really be reproducible, look at the
-#      choice entry "Released tarball from FTP", above.
-
 endchoice
diff --git a/config/libc/newlib.in b/config/libc/newlib.in
index c4b9e08..e952278 100644
--- a/config/libc/newlib.in
+++ b/config/libc/newlib.in
@@ -13,23 +13,21 @@ config LIBC_newlib
 choice
     bool
     prompt "newlib version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
 
 config NEWLIB_V_1_17_0
     bool
     prompt "1.17.0"
 
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
-
 endchoice
 
 config LIBC_VERSION
     string
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
     default "1.17.0" if NEWLIB_V_1_17_0
 
-# CT_INSERT_VERSION_STRING_ABOVE
-# Don't remove above line!
-
 config ATMEL_AVR32_HEADERS
     bool
     prompt "Install Atmel AVR32 headers"
diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in
index dbd659c..81c3b28 100644
--- a/config/libc/uClibc.in
+++ b/config/libc/uClibc.in
@@ -11,42 +11,41 @@ config LIBC_uClibc
 choice
     bool
     prompt "uClibc version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
 
-config LIBC_V_0_9_28
+config LIBC_V_0_9_30_1
     bool
-    prompt "0.9.28 (OBSOLETE)"
-    depends on OBSOLETE
+    prompt "0.9.30.1"
+    select LIBC_UCLIBC_0_9_30_or_later
 
-config LIBC_V_0_9_28_1
+config LIBC_V_0_9_30
     bool
-    prompt "0.9.28.1 (OBSOLETE)"
-    depends on OBSOLETE
+    prompt "0.9.30"
+    select LIBC_UCLIBC_0_9_30_or_later
 
-config LIBC_V_0_9_28_2
+config LIBC_V_0_9_29
     bool
-    prompt "0.9.28.2 (OBSOLETE)"
-    depends on OBSOLETE
+    prompt "0.9.29"
 
 config LIBC_V_0_9_28_3
     bool
     prompt "0.9.28.3"
 
-config LIBC_V_0_9_29
+config LIBC_V_0_9_28_2
     bool
-    prompt "0.9.29"
+    prompt "0.9.28.2 (OBSOLETE)"
+    depends on OBSOLETE
 
-config LIBC_V_0_9_30
+config LIBC_V_0_9_28_1
     bool
-    prompt "0.9.30"
-    select LIBC_UCLIBC_0_9_30_or_later
+    prompt "0.9.28.1 (OBSOLETE)"
+    depends on OBSOLETE
 
-config LIBC_V_0_9_30_1
+config LIBC_V_0_9_28
     bool
-    prompt "0.9.30.1"
-    select LIBC_UCLIBC_0_9_30_or_later
-
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
+    prompt "0.9.28 (OBSOLETE)"
+    depends on OBSOLETE
 
 config LIBC_V_snapshot
     bool
@@ -63,16 +62,16 @@ endchoice
 config LIBC_VERSION
     string
     prompt "Enter date (YYYYMMDD)" if LIBC_V_specific_date
-    default "snapshot" if LIBC_V_snapshot
-    default "0.9.28" if LIBC_V_0_9_28
-    default "0.9.28.1" if LIBC_V_0_9_28_1
-    default "0.9.28.2" if LIBC_V_0_9_28_2
-    default "0.9.28.3" if LIBC_V_0_9_28_3
-    default "0.9.29" if LIBC_V_0_9_29
-    default "0.9.30" if LIBC_V_0_9_30
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
     default "0.9.30.1" if LIBC_V_0_9_30_1
-# CT_INSERT_VERSION_STRING_ABOVE
-# Don't remove above line!
+    default "0.9.30" if LIBC_V_0_9_30
+    default "0.9.29" if LIBC_V_0_9_29
+    default "0.9.28.3" if LIBC_V_0_9_28_3
+    default "0.9.28.2" if LIBC_V_0_9_28_2
+    default "0.9.28.1" if LIBC_V_0_9_28_1
+    default "0.9.28" if LIBC_V_0_9_28
+    default "snapshot" if LIBC_V_snapshot
 
 config LIBC_UCLIBC_0_9_30_or_later
     bool
diff --git a/config/toolchain.in b/config/toolchain.in
index 9372dc4..4039d9d 100644
--- a/config/toolchain.in
+++ b/config/toolchain.in
@@ -285,43 +285,4 @@ config TARGET_SUFFIX
 
 endif # CROSS_NATIVE || CANADIAN
 
-# Kept as a separate if block, even if it could go into the above block,
-# because it seems better. No real reason, only that it seems right...
-if CANADIAN
-
-comment "Host specifics"
-
-choice
-    bool
-    prompt "|  Install tools wrapper as:"
-    depends on WRAPPER_NEEDED
-    default TOOLS_WRAPPER_SHELL
-
-config TOOLS_WRAPPER_SCRIPT
-    bool
-    prompt "shell script"
-    help
-      If your host has a shell, then you should say 'Y' here, to use
-      a (very very simple) shell script as wrapper.
-      
-      See docs/overview.txt, section "Tools wrapper".
-
-config TOOLS_WRAPPER_EXEC
-    bool
-    prompt "executable"
-    help
-      If your host lacks a shell, then you should say 'Y' here, to use
-      an executable.
-      
-      See docs/overview.txt, section "Tools wrapper".
-
-endchoice
-
-config TOOLS_WRAPPER
-    string
-    default "script" if TOOLS_WRAPPER_SCRIPT
-    default "exec"   if TOOLS_WRAPPER_EXEC
-
-endif # CROSS_NATIVE || CANADIAN
-
 endmenu
diff --git a/config/tools/libelf.in b/config/tools/libelf.in
index 3002a15..0165a39 100644
--- a/config/tools/libelf.in
+++ b/config/tools/libelf.in
@@ -8,22 +8,22 @@ config TOOL_libelf
 choice
     bool
     prompt "libelf version"
-
-config LIBELF_V_0_8_10
-    bool
-    prompt "0.8.10"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
 
 config LIBELF_V_0_8_11
     bool
     prompt "0.8.11"
 
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
+config LIBELF_V_0_8_10
+    bool
+    prompt "0.8.10"
+
 endchoice
 
 config LIBELF_VERSION
     string
-    default "0.8.10" if LIBELF_V_0_8_10
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
     default "0.8.11" if LIBELF_V_0_8_11
-# CT_INSERT_VERSION_STRING_ABOVE
-# Don't remove above line!
+    default "0.8.10" if LIBELF_V_0_8_10