diff --git a/packages/toolchain/devel/uClibc-headers/build b/packages/toolchain/devel/uClibc-headers/build
deleted file mode 100755
index 2a7dc70792..0000000000
--- a/packages/toolchain/devel/uClibc-headers/build
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-. config/options
-
-$SCRIPTS/unpack uClibc
-$SCRIPTS/install linux-headers
-
-make -C $BUILD/uClibc* PREFIX="$SYSROOT_PREFIX" install_headers
diff --git a/packages/toolchain/lang/gcc-core/build b/packages/toolchain/lang/gcc-core/build
index d006d8a1be..e4e5d201ea 100755
--- a/packages/toolchain/lang/gcc-core/build
+++ b/packages/toolchain/lang/gcc-core/build
@@ -4,11 +4,13 @@
 
 $SCRIPTS/install ccache
 $SCRIPTS/install binutils
-$SCRIPTS/build $TARGET_LIBC-headers
+$SCRIPTS/install linux-headers
 $SCRIPTS/install gmp
 $SCRIPTS/install mpfr
 $SCRIPTS/unpack gcc
 
+touch $SYSROOT_PREFIX/usr/include/limits.h
+
 setup_toolchain host
 
 cd $BUILD/gcc*
@@ -28,10 +30,10 @@ cd objdir-$1
              --disable-libgomp \
              --disable-shared \
              --disable-multilib \
-             --disable-tls \
              --disable-threads \
              --without-headers \
              --with-newlib \
              --disable-decimal-float \
              --disable-nls
-make
+
+make all-gcc all-target-libgcc
diff --git a/packages/toolchain/lang/gcc-core/install b/packages/toolchain/lang/gcc-core/install
index 3a04f8a04c..201fd62585 100755
--- a/packages/toolchain/lang/gcc-core/install
+++ b/packages/toolchain/lang/gcc-core/install
@@ -2,6 +2,6 @@
 
 . config/options
 
-make -C $BUILD/gcc*/objdir-$1 install
+make -C $BUILD/gcc*/objdir-$1 install-gcc install-target-libgcc
 
 $SCRIPTS/install ccache toolchain