diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index 2e34793b..d349dfb1 100644
--- a/config/libc/glibc.in
+++ b/config/libc/glibc.in
@@ -17,6 +17,11 @@ choice
 # Don't remove next line
 # CT_INSERT_VERSION_BELOW
 
+config LIBC_GLIBC_V_2_20
+    bool
+    prompt "2.20"
+    select LIBC_GLIBC_2_20_or_later
+
 config LIBC_GLIBC_V_2_19
     bool
     prompt "2.19"
@@ -92,10 +97,14 @@ config LIBC_GLIBC_V_2_8
 
 endchoice
 
+config LIBC_GLIBC_2_20_or_later
+    bool
+
 config LIBC_VERSION
     string
 # Don't remove next line
 # CT_INSERT_VERSION_STRING_BELOW
+    default "2.20" if LIBC_GLIBC_V_2_20
     default "2.19" if LIBC_GLIBC_V_2_19
     default "2.18" if LIBC_GLIBC_V_2_18
     default "2.17" if LIBC_GLIBC_V_2_17
diff --git a/scripts/build/libc/glibc-eglibc.sh-common b/scripts/build/libc/glibc-eglibc.sh-common
index 4d961fd2..af3b1f14 100644
--- a/scripts/build/libc/glibc-eglibc.sh-common
+++ b/scripts/build/libc/glibc-eglibc.sh-common
@@ -487,10 +487,12 @@ do_libc_add_ons_list() {
     local addons_list="$( echo "${CT_LIBC_ADDONS_LIST}"         \
                           |sed -r -e "s/[[:space:],]/${sep}/g;" \
                         )"
-    case "${CT_THREADS}" in
-        none)   ;;
-        *)      addons_list="${addons_list}${sep}${CT_THREADS}";;
-    esac
+    if [ "${CT_LIBC_GLIBC_2_20_or_later}" != "y" ]; then
+        case "${CT_THREADS}" in
+            none)   ;;
+            *)      addons_list="${addons_list}${sep}${CT_THREADS}";;
+        esac
+    fi
     [ "${CT_LIBC_GLIBC_USE_PORTS}" = "y" ] && addons_list="${addons_list}${sep}ports"
     # Remove duplicate, leading and trailing separators
     echo "${addons_list}" |sed -r -e "s/${sep}+/${sep}/g; s/^${sep}//; s/${sep}\$//;"