diff --git a/packages/toolchain/lang/gcc-final/build b/packages/toolchain/lang/gcc-final/build
index a3b8215288..bd340f159d 100755
--- a/packages/toolchain/lang/gcc-final/build
+++ b/packages/toolchain/lang/gcc-final/build
@@ -9,6 +9,9 @@ $SCRIPTS/unpack gcc
 
 setup_toolchain host
 
+TLS_CONFIG="--enable-tls"
+[ $TARGET_LIBC = "uClibc" ] && TLS_CONFIG="--disable-tls"
+
 cd $BUILD/gcc*
 mkdir -p objdir-$1
 cd objdir-$1
@@ -25,7 +28,7 @@ cd objdir-$1
              --disable-libmudflap \
              --disable-libssp \
              --disable-multilib \
-             --disable-tls \
+             $TLS_CONFIG \
              --enable-shared \
              --enable-c99 \
              --enable-long-long \
diff --git a/packages/toolchain/lang/gcc/patches/100-uclibc-conf-gcc-4.4.0.diff b/packages/toolchain/lang/gcc/patches/100_uclibc-conf.diff
similarity index 53%
rename from packages/toolchain/lang/gcc/patches/100-uclibc-conf-gcc-4.4.0.diff
rename to packages/toolchain/lang/gcc/patches/100_uclibc-conf.diff
index cca8c82292..6bad179e62 100644
--- a/packages/toolchain/lang/gcc/patches/100-uclibc-conf-gcc-4.4.0.diff
+++ b/packages/toolchain/lang/gcc/patches/100_uclibc-conf.diff
@@ -11,23 +11,3 @@
  elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
    make bootstrap || exit 1
    make install || exit 1
---- gcc/libjava/classpath/ltconfig
-+++ gcc/libjava/classpath/ltconfig
-@@ -603,7 +603,7 @@
- 
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
--linux-gnu*) ;;
-+linux-gnu*|linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
- 
-@@ -1251,7 +1251,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
diff --git a/packages/toolchain/lang/gcc/patches/301-missing-execinfo_h-gcc-4.4.0.diff b/packages/toolchain/lang/gcc/patches/301-missing-execinfo_h-gcc-4.4.0.diff
deleted file mode 100644
index 0e2092f3fb..0000000000
--- a/packages/toolchain/lang/gcc/patches/301-missing-execinfo_h-gcc-4.4.0.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc-4.0.0/boehm-gc/include/gc.h-orig	2005-04-28 22:28:57.000000000 -0500
-+++ gcc-4.0.0/boehm-gc/include/gc.h	2005-04-28 22:30:38.000000000 -0500
-@@ -500,7 +500,7 @@
- #ifdef __linux__
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
--     && !defined(__ia64__)
-+     && !defined(__ia64__) && !defined(__UCLIBC__)
- #   ifndef GC_HAVE_BUILTIN_BACKTRACE
- #     define GC_HAVE_BUILTIN_BACKTRACE
- #   endif
diff --git a/packages/toolchain/lang/gcc/url b/packages/toolchain/lang/gcc/url
index b4ed9381b0..a75a81c3ae 100644
--- a/packages/toolchain/lang/gcc/url
+++ b/packages/toolchain/lang/gcc/url
@@ -1,2 +1 @@
-ftp://ftp.fu-berlin.de/unix/languages/gcc/releases/gcc-4.4.0/gcc-4.4.0.tar.bz2
-
+ftp://ftp.fu-berlin.de/unix/languages/gcc/releases/gcc-4.4.1/gcc-4.4.1.tar.bz2
\ No newline at end of file