diff --git a/toolchain/glibc/Config.in b/toolchain/glibc/Config.in
index 50e44c831d..00262dd406 100644
--- a/toolchain/glibc/Config.in
+++ b/toolchain/glibc/Config.in
@@ -1,7 +1,7 @@
 choice
 	prompt "(e)glibc version"
 	depends on TOOLCHAINOPTS && USE_GLIBC
-	default EGLIBC_USE_VERSION_2_19
+	default EGLIBC_USE_VERSION_2_22
 	help
 	  Select the version of glibc you wish to use.
 
diff --git a/toolchain/glibc/Config.version b/toolchain/glibc/Config.version
index 39066d0c30..060587461b 100644
--- a/toolchain/glibc/Config.version
+++ b/toolchain/glibc/Config.version
@@ -7,13 +7,13 @@ config GLIBC_VERSION
 	default "2.22" if GLIBC_VERSION_2_22
 
 config EGLIBC_VERSION_2_19
-	default y if !TOOLCHAINOPTS
 	bool
 
 config GLIBC_VERSION_2_21
 	bool
 
 config GLIBC_VERSION_2_22
+	default y if !TOOLCHAINOPTS
 	bool
 
 config GLIBC_REVISION