diff --git a/config/libc/glibc-eglibc.in-common b/config/libc/glibc-eglibc.in-common
index 86444be9..e72c2af0 100644
--- a/config/libc/glibc-eglibc.in-common
+++ b/config/libc/glibc-eglibc.in-common
@@ -72,6 +72,12 @@ config LIBC_ADDONS_LIST
 
       Eg.: crypt        (for very old libces)
 
+if LIBC_GLIBC_2_8_or_later && ( LIBC_GLIBC_USE_PORTS || ( LIBC_ADDONS_LIST != "" ) )
+comment "WARNING!!!"
+comment "For glibc >= 2.8, addons are only available via a CVS checkout."
+comment "Be sure to review the associated options, above."
+endif
+
 if KERNEL_linux
 
 choice
diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index f664b17e..204b65ea 100644
--- a/config/libc/glibc.in
+++ b/config/libc/glibc.in
@@ -40,10 +40,12 @@ config LIBC_V_2_7
 config LIBC_V_2_8
     bool
     prompt "2.8"
+    select LIBC_GLIBC_2_8_or_later
 
 config LIBC_V_2_9
     bool
     prompt "2.9"
+    select LIBC_GLIBC_2_8_or_later
 
 # CT_INSERT_VERSION_ABOVE
 # Don't remove above line!
@@ -76,6 +78,10 @@ config LIBC_VERSION
 # CT_INSERT_VERSION_STRING_ABOVE
 # Don't remove above line!
 
+config LIBC_GLIBC_2_8_or_later
+    bool
+    default n
+
 choice
     bool
     prompt "Retrieval method"
@@ -84,6 +90,7 @@ choice
 config LIBC_GLIBC_TARBALL
     bool
     prompt "Released tarball"
+    depends on ! LIBC_GLIBC_2_8_or_later || ! ( LIBC_GLIBC_USE_PORTS || ( LIBC_ADDONS_LIST != "" ) )
     help
       Until end of Februrary 2009, there was no tarball for glibc releases
       2.8 and later. This was intentional.