7 files changed, 49 insertions, 9 deletions
diff --git a/config/binutils/binutils.in.2 b/config/binutils/binutils.in.2
index 7a1291f..dfb00bd 100644
--- a/config/binutils/binutils.in.2
+++ b/config/binutils/binutils.in.2
@@ -2,6 +2,10 @@
 
 if ARCH_BINFMT_FLAT
 
+config ELF2FLT_REQUIRES_ZLIB
+    def_bool y
+    select ZLIB
+
 comment "elf2flt"
 
 choice
diff --git a/config/cc/gcc.in.2 b/config/cc/gcc.in.2
index 2c5d45e..aad488b 100644
--- a/config/cc/gcc.in.2
+++ b/config/cc/gcc.in.2
@@ -81,6 +81,9 @@ config CC_GCC_SYSTEM_ZLIB
     help
       Do not use bundled zlib, and use the zlib already available for
       the host (eg. the system library).
+
+      If zlib is built as a companion library, selecting this option
+      will use it.
       
       If you want to build a static toolchain, you will need to also
       install the static version of zlib for your host.
diff --git a/config/companion_libs.in b/config/companion_libs.in
index 7d1d4f7..02f2ecb 100644
--- a/config/companion_libs.in
+++ b/config/companion_libs.in
@@ -119,6 +119,12 @@ config NCURSES
 config NCURSES_TARGET
     bool
 
+config ZLIB
+    bool "Build local zlib"
+
+if ZLIB
+source "config/companion_libs/zlib.in"
+endif
 if LIBICONV
 source "config/companion_libs/libiconv.in"
 endif
diff --git a/config/companion_libs/zlib.in b/config/companion_libs/zlib.in
new file mode 100644
index 0000000..df93682
--- /dev/null
+++ b/config/companion_libs/zlib.in
@@ -0,0 +1,19 @@
+# Zlib options
+
+choice
+    bool
+    prompt "zlib version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
+
+config ZLIB_V_1_2_11
+    bool
+    prompt "1.2.11"
+
+endchoice
+
+config ZLIB_VERSION
+    string
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
+    default "1.2.11" if ZLIB_V_1_2_11
diff --git a/config/kernel/linux.in b/config/kernel/linux.in
index 56756e7..940d92e 100644
--- a/config/kernel/linux.in
+++ b/config/kernel/linux.in
@@ -46,7 +46,7 @@ choice
 
 config KERNEL_V_4_9
     bool
-    prompt "4.9.5"
+    prompt "4.9.8"
 
 config KERNEL_V_4_8
     bool
@@ -55,7 +55,7 @@ config KERNEL_V_4_8
 
 config KERNEL_V_4_4
     bool
-    prompt "4.4.44"
+    prompt "4.4.47"
 
 config KERNEL_V_4_1
     bool
@@ -63,7 +63,7 @@ config KERNEL_V_4_1
 
 config KERNEL_V_3_18
     bool
-    prompt "3.18.47"
+    prompt "3.18.47 (EOL)"
 
 config KERNEL_V_3_16
     bool
@@ -71,7 +71,7 @@ config KERNEL_V_3_16
 
 config KERNEL_V_3_12
     bool
-    prompt "3.12.69"
+    prompt "3.12.70"
 
 config KERNEL_V_3_10
     bool
@@ -91,13 +91,13 @@ config KERNEL_VERSION
     string
 # Don't remove next line
 # CT_INSERT_VERSION_STRING_BELOW
-    default "4.9.5" if KERNEL_V_4_9
+    default "4.9.8" if KERNEL_V_4_9
     default "4.8.17" if KERNEL_V_4_8
-    default "4.4.44" if KERNEL_V_4_4
+    default "4.4.47" if KERNEL_V_4_4
     default "4.1.38" if KERNEL_V_4_1
     default "3.18.47" if KERNEL_V_3_18
     default "3.16.39" if KERNEL_V_3_16
-    default "3.12.69" if KERNEL_V_3_12
+    default "3.12.70" if KERNEL_V_3_12
     default "3.10.104" if KERNEL_V_3_10
     default "3.4.113" if KERNEL_V_3_4
     default "3.2.84" if KERNEL_V_3_2
diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index d6bd013..767cbbf 100644
--- a/config/libc/glibc.in
+++ b/config/libc/glibc.in
@@ -71,6 +71,11 @@ choice
 # Don't remove next line
 # CT_INSERT_VERSION_BELOW
 
+config LIBC_GLIBC_V_2_25
+    bool
+    prompt "2.25"
+    select LIBC_GLIBC_2_23_or_later
+
 config LIBC_GLIBC_V_2_24
     bool
     prompt "2.24"
@@ -136,6 +141,7 @@ config LIBC_VERSION
     string
 # Don't remove next line
 # CT_INSERT_VERSION_STRING_BELOW
+    default "2.25" if LIBC_GLIBC_V_2_25
     default "2.24" if LIBC_GLIBC_V_2_24
     default "2.23" if LIBC_GLIBC_V_2_23
     default "2.22" if LIBC_GLIBC_V_2_22
diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in
index 219426a..e830662 100644
--- a/config/libc/uClibc.in
+++ b/config/libc/uClibc.in
@@ -35,7 +35,8 @@ choice
     prompt "uClibc Version Name"
 
 config LIBC_UCLIBC_CUSTOM_UCLIBC
-    bool "uClibc"
+    bool "uClibc (OBSOLETE)"
+    depends on OBSOLETE
     select LIBC_UCLIBC_0_9_33_2_or_later
 
 config LIBC_UCLIBC_CUSTOM_UCLIBC_NG
@@ -100,7 +101,8 @@ config LIBC_UCLIBC_NG_V_1_0_20
 
 config LIBC_UCLIBC_V_0_9_33_2
     bool
-    prompt "0.9.33.2"
+    prompt "0.9.33.2 (OBSOLETE)"
+    depends on OBSOLETE
     select LIBC_UCLIBC_0_9_33_2_or_later
 
 endchoice