diff --git a/packages/toolchain/devel/uClibc/config/uClibc.i386.conf b/packages/toolchain/devel/uClibc/config/uClibc.i386.conf
index a3b0232aec..95b6a957b8 100644
--- a/packages/toolchain/devel/uClibc/config/uClibc.i386.conf
+++ b/packages/toolchain/devel/uClibc/config/uClibc.i386.conf
@@ -2,7 +2,6 @@
 # Automatically generated make config: don't edit
 # Version: 0.9.30-git
 #
-TARGET_ARCH="i386"
 # TARGET_alpha is not set
 # TARGET_arm is not set
 # TARGET_avr32 is not set
@@ -32,24 +31,7 @@ TARGET_i386=y
 #
 # Target Architecture Features and Options
 #
-TARGET_SUBARCH=""
-
-#
-# Using ELF file format
-#
-ARCH_LITTLE_ENDIAN=y
-
-#
-# Using Little Endian
-#
-ARCH_HAS_MMU=y
-ARCH_USE_MMU=y
-UCLIBC_HAS_FLOATS=y
-UCLIBC_HAS_FPU=y
-DO_C99_MATH=y
-UCLIBC_HAS_FENV=y
-UCLIBC_HAS_LONG_DOUBLE_MATH=y
-KERNEL_HEADERS="/home/stephan/projects/OpenELEC.myth/build.OpenELEC.intel.i386.uClibc.devel/linux-2.6.31/dest/include"
+TARGET_ARCH="i386"
 FORCE_OPTIONS_FOR_ARCH=y
 # CONFIG_GENERIC_386 is not set
 # CONFIG_386 is not set
@@ -68,6 +50,25 @@ CONFIG_586=y
 # CONFIG_WINCHIP2 is not set
 # CONFIG_CYRIXIII is not set
 # CONFIG_NEHEMIAH is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_LITTLE_ENDIAN=y
+
+#
+# Using Little Endian
+#
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+UCLIBC_HAS_FPU=y
+DO_C99_MATH=y
+UCLIBC_HAS_FENV=y
+UCLIBC_HAS_LONG_DOUBLE_MATH=y
+KERNEL_HEADERS=""
+HAVE_DOT_CONFIG=y
 
 #
 # General Library Settings
@@ -151,6 +152,7 @@ UCLIBC_HAS_RPC=y
 # UCLIBC_HAS_BSD_RES_CLOSE is not set
 UCLIBC_HAS_COMPAT_RES_STATE=y
 # UCLIBC_HAS_EXTRA_COMPAT_RES_STATE is not set
+# UCLIBC_HAS_RESOLV_STUB is not set
 
 #
 # String and Stdio Support
@@ -234,9 +236,8 @@ DOSTRIP=y
 # DOASSERTS is not set
 # SUPPORT_LD_DEBUG is not set
 # SUPPORT_LD_DEBUG_EARLY is not set
-UCLIBC_MALLOC_DEBUGGING=y
+# UCLIBC_MALLOC_DEBUGGING is not set
 WARNINGS="-Wall"
 # EXTRA_WARNINGS is not set
 # DOMULTI is not set
 # UCLIBC_MJN3_ONLY is not set
-HAVE_DOT_CONFIG=y
diff --git a/packages/toolchain/devel/uClibc/install b/packages/toolchain/devel/uClibc/install
index 540ffa18df..775511d590 100755
--- a/packages/toolchain/devel/uClibc/install
+++ b/packages/toolchain/devel/uClibc/install
@@ -30,7 +30,7 @@ fi
 
     [ "$DEVTOOLS" = yes ] && cp $PKG_BUILD/lib/libthread_db.so.1 $INSTALL/lib
     [ "$NETWORK" = yes ] && cp $PKG_BUILD/lib/libcrypt.so.0 $INSTALL/lib
-    [ "$NETWORK" = yes ] && cp $PKG_BUILD/lib/libresolv.so.0 $INSTALL/lib
+#    [ "$NETWORK" = yes ] && cp $PKG_BUILD/lib/libresolv.so.0 $INSTALL/lib
 
     [ "$DEVTOOLS" = yes ] && \
       mkdir -p $INSTALL/bin && \
diff --git a/packages/toolchain/devel/uClibc/patches/0b03a65afa92d2e4c51ff49d39d4d34143749305.diff b/packages/toolchain/devel/uClibc/patches/0b03a65afa92d2e4c51ff49d39d4d34143749305.diff
new file mode 100644
index 0000000000..e31281b098
--- /dev/null
+++ b/packages/toolchain/devel/uClibc/patches/0b03a65afa92d2e4c51ff49d39d4d34143749305.diff
@@ -0,0 +1,43 @@
+From 0b03a65afa92d2e4c51ff49d39d4d34143749305 Mon Sep 17 00:00:00 2001
+From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+Date: Thu, 17 Sep 2009 07:29:59 +0000
+Subject: No need for a libresolv stub
+
+  libresolv is just a stub anyway, default to not building it.
+
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in
+index 0108cb0..efa90d7 100644
+--- a/extra/Configs/Config.in
++++ b/extra/Configs/Config.in
+@@ -1183,6 +1183,12 @@ config UCLIBC_HAS_EXTRA_COMPAT_RES_STATE
+ 	  Answer Y if selecting UCLIBC_HAS_COMPAT_RES_STATE is not enough.
+ 	  As far as I can say, this should never be needed.
+ 
++config UCLIBC_HAS_RESOLV_STUB
++	bool "Provide libresolv stub"
++	default n
++	help
++	  Provide a dummy resolv library.
++
+ endif
+ 
+ 
+diff --git a/libresolv/Makefile.in b/libresolv/Makefile.in
+index b7475d7..879603b 100644
+--- a/libresolv/Makefile.in
++++ b/libresolv/Makefile.in
+@@ -28,8 +28,10 @@ libresolv-a-y := $(libresolv_OBJ)
+ endif
+ libresolv-so-y := $(libresolv_OBJ:.o=.os)
+ 
++ifeq ($(UCLIBC_HAS_RESOLV_STUB),y)
+ lib-a-y += $(top_builddir)lib/libresolv.a
+ lib-so-y += $(top_builddir)lib/libresolv.so
++endif
+ objclean-y += libresolv_clean
+ 
+ ifeq ($(DOPIC),y)
+--
+cgit v0.8.2.1
diff --git a/packages/toolchain/devel/uClibc/url b/packages/toolchain/devel/uClibc/url
index 3da3b4fae0..39bfc16fb1 100644
--- a/packages/toolchain/devel/uClibc/url
+++ b/packages/toolchain/devel/uClibc/url
@@ -1 +1 @@
-http://sources.openelec.tv/svn/uClibc-20090907.tar.bz2
+http://sources.openelec.tv/svn/uClibc-20090917.tar.bz2