diff --git a/toolchain/Config.in b/toolchain/Config.in
index ed5a93978..a36a0a87f 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -27,6 +27,13 @@ config LARGEFILE
 	help
 		Enable large file (files > 2 GB) support
 
+config SHADOW_PASSWORDS
+	bool
+	prompt "Enable shadow password support?" if TOOLCHAINOPTS
+	default y
+	help
+		Enable shadow password support.
+
 config SOFT_FLOAT
 	bool
 	prompt "Use software floating point by default" if TOOLCHAINOPTS
diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index a9093a96c..450fb442d 100644
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2006 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -46,6 +46,7 @@ define Build/Prepare
 	$(SED) 's,^KERNEL_HEADERS=.*,KERNEL_HEADERS=\"$(LINUX_HEADERS_DIR)/include\",g' \
 		-e 's,.*UCLIBC_HAS_FPU.*,UCLIBC_HAS_FPU=$(if $(CONFIG_SOFT_FLOAT),n\nUCLIBC_HAS_FLOATS=y\nUCLIBC_HAS_SOFT_FLOAT=y,y),g' \
 		-e 's,^.*UCLIBC_HAS_LFS.*,UCLIBC_HAS_LFS=$(if $(CONFIG_LARGEFILE),y,n),g' \
+		-e 's,^.*UCLIBC_HAS_SHADOW.*,UCLIBC_HAS_SHADOW=$(if $(CONFIG_SHADOW_PASSWORDS),y,n),g' \
 		$(PKG_BUILD_DIR)/.config
 	mkdir -p $(BUILD_DIR_HOST)/uClibc_dev/usr/include
 	mkdir -p $(BUILD_DIR_HOST)/uClibc_dev/usr/lib
@@ -90,7 +91,7 @@ UCLIBC_MAKE := PATH=$(TARGET_PATH) $(MAKE) -C $(PKG_BUILD_DIR) \
 
 define Build/Compile
 	$(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(PKG_BUILD_DIR)/Rules.mak
-	$(UCLIBC_MAKE) PREFIX= all 
+	$(UCLIBC_MAKE) PREFIX= all
 	$(UCLIBC_MAKE) PREFIX=$(STAGING_DIR_HOST)/ install_runtime install_dev
 	$(SED) 's,UCLIBC_VERSION=.*,UCLIBC_VERSION=$(PKG_VERSION),' $(TOOLCHAIN_DIR)/info.mk
 	$(SED) 's,UCLIBC_PATCHVER=.*,UCLIBC_PATCHVER=$(PKG_EXTRAVERSION),' $(TOOLCHAIN_DIR)/info.mk
diff --git a/toolchain/uClibc/config/arm b/toolchain/uClibc/config/arm
index 6051320b3..6ec55f7e9 100644
--- a/toolchain/uClibc/config/arm
+++ b/toolchain/uClibc/config/arm
@@ -91,11 +91,10 @@ LINUXTHREADS_OLD=y
 MALLOC_STANDARD=y
 MALLOC_GLIBC_COMPAT=y
 UCLIBC_DYNAMIC_ATEXIT=y
-HAS_SHADOW=y
 COMPAT_ATEXIT=y
 # UCLIBC_SUSV3_LEGACY is not set
 UCLIBC_SUSV3_LEGACY_MACROS=y
-# UCLIBC_HAS_SHADOW is not set
+UCLIBC_HAS_SHADOW=y
 # UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
 UCLIBC_HAS___PROGNAME=y
 # UNIX98PTY_ONLY is not set
diff --git a/toolchain/uClibc/config/armeb b/toolchain/uClibc/config/armeb
index c156125bc..d3c5085bf 100644
--- a/toolchain/uClibc/config/armeb
+++ b/toolchain/uClibc/config/armeb
@@ -92,11 +92,10 @@ LINUXTHREADS_OLD=y
 MALLOC_STANDARD=y
 MALLOC_GLIBC_COMPAT=y
 UCLIBC_DYNAMIC_ATEXIT=y
-HAS_SHADOW=y
 COMPAT_ATEXIT=y
 # UCLIBC_SUSV3_LEGACY is not set
 UCLIBC_SUSV3_LEGACY_MACROS=y
-# UCLIBC_HAS_SHADOW is not set
+UCLIBC_HAS_SHADOW=y
 # UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
 UCLIBC_HAS___PROGNAME=y
 # UNIX98PTY_ONLY is not set
diff --git a/toolchain/uClibc/config/avr32 b/toolchain/uClibc/config/avr32
index 24340db0b..f6b449a61 100644
--- a/toolchain/uClibc/config/avr32
+++ b/toolchain/uClibc/config/avr32
@@ -76,11 +76,10 @@ LINUXTHREADS_OLD=y
 MALLOC_STANDARD=y
 MALLOC_GLIBC_COMPAT=y
 UCLIBC_DYNAMIC_ATEXIT=y
-HAS_SHADOW=y
 COMPAT_ATEXIT=y
 # UCLIBC_SUSV3_LEGACY is not set
 UCLIBC_SUSV3_LEGACY_MACROS=y
-# UCLIBC_HAS_SHADOW is not set
+UCLIBC_HAS_SHADOW=y
 # UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
 UCLIBC_HAS___PROGNAME=y
 UNIX98PTY_ONLY=y
diff --git a/toolchain/uClibc/config/cris b/toolchain/uClibc/config/cris
index 389ba8af9..f0071dc2b 100644
--- a/toolchain/uClibc/config/cris
+++ b/toolchain/uClibc/config/cris
@@ -69,7 +69,7 @@ UCLIBC_HAS_LFS=y
 MALLOC_STANDARD=y
 MALLOC_GLIBC_COMPAT=y
 UCLIBC_DYNAMIC_ATEXIT=y
-HAS_SHADOW=y
+UCLIBC_HAS_SHADOW=y
 # UNIX98PTY_ONLY is not set
 ASSUME_DEVPTS=y
 UCLIBC_HAS_TM_EXTENSIONS=y
diff --git a/toolchain/uClibc/config/i386 b/toolchain/uClibc/config/i386
index ee215e63a..a1a0d3d4c 100644
--- a/toolchain/uClibc/config/i386
+++ b/toolchain/uClibc/config/i386
@@ -96,7 +96,7 @@ UCLIBC_DYNAMIC_ATEXIT=y
 COMPAT_ATEXIT=y
 # UCLIBC_SUSV3_LEGACY is not set
 UCLIBC_SUSV3_LEGACY_MACROS=y
-# UCLIBC_HAS_SHADOW is not set
+UCLIBC_HAS_SHADOW=y
 # UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
 UCLIBC_HAS___PROGNAME=y
 # UNIX98PTY_ONLY is not set
diff --git a/toolchain/uClibc/config/i686 b/toolchain/uClibc/config/i686
index 5b9e047ff..84e892e25 100644
--- a/toolchain/uClibc/config/i686
+++ b/toolchain/uClibc/config/i686
@@ -96,7 +96,7 @@ UCLIBC_DYNAMIC_ATEXIT=y
 COMPAT_ATEXIT=y
 # UCLIBC_SUSV3_LEGACY is not set
 UCLIBC_SUSV3_LEGACY_MACROS=y
-# UCLIBC_HAS_SHADOW is not set
+UCLIBC_HAS_SHADOW=y
 # UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
 UCLIBC_HAS___PROGNAME=y
 # UNIX98PTY_ONLY is not set
diff --git a/toolchain/uClibc/config/mips b/toolchain/uClibc/config/mips
index 09191e56c..13026be7b 100644
--- a/toolchain/uClibc/config/mips
+++ b/toolchain/uClibc/config/mips
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2006 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -89,11 +89,10 @@ LINUXTHREADS_OLD=y
 MALLOC_STANDARD=y
 MALLOC_GLIBC_COMPAT=y
 UCLIBC_DYNAMIC_ATEXIT=y
-HAS_SHADOW=y
 COMPAT_ATEXIT=y
 # UCLIBC_SUSV3_LEGACY is not set
 UCLIBC_SUSV3_LEGACY_MACROS=y
-# UCLIBC_HAS_SHADOW is not set
+UCLIBC_HAS_SHADOW=y
 # UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
 UCLIBC_HAS___PROGNAME=y
 # UNIX98PTY_ONLY is not set
diff --git a/toolchain/uClibc/config/mipsel b/toolchain/uClibc/config/mipsel
index 13dd6f90e..998d2f142 100644
--- a/toolchain/uClibc/config/mipsel
+++ b/toolchain/uClibc/config/mipsel
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2006 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -89,11 +89,10 @@ LINUXTHREADS_OLD=y
 MALLOC_STANDARD=y
 MALLOC_GLIBC_COMPAT=y
 UCLIBC_DYNAMIC_ATEXIT=y
-HAS_SHADOW=y
 COMPAT_ATEXIT=y
 # UCLIBC_SUSV3_LEGACY is not set
 UCLIBC_SUSV3_LEGACY_MACROS=y
-# UCLIBC_HAS_SHADOW is not set
+UCLIBC_HAS_SHADOW=y
 # UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
 UCLIBC_HAS___PROGNAME=y
 # UNIX98PTY_ONLY is not set
diff --git a/toolchain/uClibc/config/powerpc b/toolchain/uClibc/config/powerpc
index f702bad78..f0635a337 100644
--- a/toolchain/uClibc/config/powerpc
+++ b/toolchain/uClibc/config/powerpc
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2006 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -78,11 +78,10 @@ LINUXTHREADS_OLD=y
 MALLOC_STANDARD=y
 MALLOC_GLIBC_COMPAT=y
 UCLIBC_DYNAMIC_ATEXIT=y
-HAS_SHADOW=y
 COMPAT_ATEXIT=y
 # UCLIBC_SUSV3_LEGACY is not set
 UCLIBC_SUSV3_LEGACY_MACROS=y
-# UCLIBC_HAS_SHADOW is not set
+UCLIBC_HAS_SHADOW=y
 # UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
 UCLIBC_HAS___PROGNAME=y
 # UNIX98PTY_ONLY is not set
diff --git a/toolchain/uClibc/config/x86_64 b/toolchain/uClibc/config/x86_64
index 27c57a70f..cb6b0224f 100644
--- a/toolchain/uClibc/config/x86_64
+++ b/toolchain/uClibc/config/x86_64
@@ -65,7 +65,7 @@ UCLIBC_HAS_LFS=y
 MALLOC_STANDARD=y
 MALLOC_GLIBC_COMPAT=y
 UCLIBC_DYNAMIC_ATEXIT=y
-HAS_SHADOW=y
+UCLIBC_HAS_SHADOW=y
 # UNIX98PTY_ONLY is not set
 ASSUME_DEVPTS=y
 UCLIBC_HAS_TM_EXTENSIONS=y