diff -r c3516fc7460d -r 777153645ab8 config/libc/glibc.in
--- a/config/libc/glibc.in	Sun Jan 04 12:46:13 2009 +0000
+++ b/config/libc/glibc.in	Sun Mar 15 20:50:40 2009 +0000
@@ -38,13 +38,11 @@
 
 config LIBC_V_2_8
     bool
-    prompt "2_8"
-    select LIBC_GLIBC_2_8_or_later
+    prompt "2.8"
 
 config LIBC_V_2_9
     bool
-    prompt "2_9"
-    select LIBC_GLIBC_2_8_or_later
+    prompt "2.9"
 
 # CT_INSERT_VERSION_ABOVE
 # Don't remove above line!
@@ -72,28 +70,48 @@
     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
-    default "2_9" if LIBC_V_2_9
+    default "2.8" if LIBC_V_2_8
+    default "2.9" if LIBC_V_2_9
 # CT_INSERT_VERSION_STRING_ABOVE
 # Don't remove above line!
 
-config LIBC_GLIBC_2_8_or_later
+choice
     bool
-    default n
+    prompt "Retrieval method"
+    default LIBC_GLIBC_TARBALL
 
-if LIBC_GLIBC_2_8_or_later
+config LIBC_GLIBC_TARBALL
+    bool
+    prompt "Released tarball"
+    help
+      Until end of Februrary 2009, there was no tarball for glibc releases
+      2.8 and later. This was intentional.
+      
+      Then, all of a sudden, tarballs for those releases have appeared at the
+      traditional download place (ftp.gnu.org).
+      
+      Some of the glibc people argue that fixes are committed to the maintenance
+      branch, and thus it is the best plac e to retrieve the glibc from.
+      On the other hand, it might be preferable to always generate a toolchain
+      using a known code-base, so the toolchain can be reproducible.
+      
+      For version prior to 2.8, tarballs were readily available.
+      
+      If you want your toolchain to really be reproducible, say 'Y' here.
+      If you can live with a moving code-base, look at the other choice
+      entries, below.
 
-config LIBC_GLIBC_latest_snapshot
+config LIBC_GLIBC_CVS
     bool
-    prompt "Use latest nightly snapshot"
-    default n
+    prompt "CVS checkout"
     help
-      Say 'y' to use the latest nightly snapshot.
-      Not recommended, as the toolchain will not be reproducible.
+      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.
 
-if ! LIBC_GLIBC_latest_snapshot
-
-comment "Using CVS checkout"
+if LIBC_GLIBC_CVS
 
 config LIBC_GLIBC_CVS_date
     string
@@ -102,15 +120,16 @@
     help
       The date, in ISO-8601 format, at which to check out the repository.
 
-#config LIBC_GLIBC_CVS_CHECKOUT
+endif #  LIBC_GLIBC_CVS
+
+#config LIBC_GLIBC_SNAPSHOT
 #    bool
-#    prompt "checkout instead of export"
-#    default n
+#    prompt "Use latest nightly snapshot"
 #    help
-#      Use checkout rather than export, so that you can later update
-#      the sources.
-#      Not recommended, as the toolchain could be non-reproducible.
+#      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.
 
-endif # ! LIBC_GLIBC_latest_snapshot
-
-endif # LIBC_GLIBC_2_8_or_later
+endchoice