diff --git a/packages/toolchain/devel/eglibc/build b/packages/toolchain/devel/eglibc/build
index e8a2776884..d07daf3c50 100755
--- a/packages/toolchain/devel/eglibc/build
+++ b/packages/toolchain/devel/eglibc/build
@@ -53,6 +53,8 @@ EOF
 # needed by PAM:        OPTION_EGLIBC_GETLOGIN = y
 # needed by PAM:        OPTION_EGLIBC_UTMP = y
 # libiconv replacement: OPTION_EGLIBC_CHARSETS = y
+# OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG = $NSS_CONF_DIR/fixed-nsswitch.conf
+# OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS = $NSS_CONF_DIR/fixed-nsswitch.functions
 
 cat >options-groups.conf <<EOF
 OPTION_EGLIBC_ADVANCED_INET6 = n
@@ -62,9 +64,7 @@ OPTION_EGLIBC_CATGETS = n
 OPTION_EGLIBC_DB_ALIASES = n
 OPTION_EGLIBC_LOCALES = n
 OPTION_EGLIBC_NIS = n
-OPTION_EGLIBC_NSSWITCH = n
-OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG = $NSS_CONF_DIR/fixed-nsswitch.conf
-OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS = $NSS_CONF_DIR/fixed-nsswitch.functions
+OPTION_EGLIBC_NSSWITCH = y
 OPTION_EGLIBC_RCMD = n
 OPTION_EGLIBC_RTLD_DEBUG = n
 OPTION_POSIX_REGEXP_GLIBC = n
@@ -90,7 +90,7 @@ EOF
              --enable-bind-now \
              --with-elf \
              --with-tls \
-             --enable-kernel=2.6.35 \
+             --enable-kernel=2.6.36 \
              --with-__thread \
              --with-binutils=$BUILD/toolchain/bin \
              --with-headers=$SYSROOT_PREFIX/usr/include \
diff --git a/packages/toolchain/devel/eglibc/config/nsswitch.conf b/packages/toolchain/devel/eglibc/config/nsswitch.conf
new file mode 100644
index 0000000000..4d2a76376d
--- /dev/null
+++ b/packages/toolchain/devel/eglibc/config/nsswitch.conf
@@ -0,0 +1,19 @@
+# /etc/nsswitch.conf
+#
+# Example configuration of GNU Name Service Switch functionality.
+#
+
+passwd:		db files
+group:		db files
+shadow:		db files
+gshadow:	files
+
+hosts:		files dns
+networks:	files dns
+
+protocols:	db files
+services:	db files
+ethers:		db files
+rpc:		db files
+
+netgroup:	db files
diff --git a/packages/toolchain/devel/eglibc/install b/packages/toolchain/devel/eglibc/install
index b0f77ce902..9cf5f5b03c 100755
--- a/packages/toolchain/devel/eglibc/install
+++ b/packages/toolchain/devel/eglibc/install
@@ -30,3 +30,6 @@ mkdir -p $INSTALL/bin
   # didn't yet find a way to separate only needed modules.
   # the way they are used is described within gconv-modules though
     cp $PKG_BUILD/objdir-$1/iconvdata/*.so $INSTALL/usr/lib/gconv
+
+mkdir -p $INSTALL/etc
+    cp $PKG_DIR/config/nsswitch.conf $INSTALL/etc