diff -ru cs2005q3-2_toolchain/build-toolchains.sh i/cs2005q3-2_toolchain/build-toolchains.sh
--- cs2005q3-2_toolchain/build-toolchains.sh	2006-04-13 03:09:12.000000000 +0200
+++ i/cs2005q3-2_toolchain/build-toolchains.sh	2009-11-05 23:00:27.000000000 +0100
@@ -22,9 +22,9 @@
 
 [ "x$1" = "xpackage" ] && (
 
-do_package "cs2005q3.2-glibc-arm" "cs2005q3.2-glibc-arm"
-do_package "cs2005q3.2-glibc-i386" "cs2005q3.2-glibc-i386"
-#do_package "cs2005q3.2-uclibc-arm" "cs2005q3.2-uclibc-arm"
+#do_package "cs2005q3.2-glibc-arm" "cs2005q3.2-glibc-arm"
+#do_package "cs2005q3.2-glibc-i386" "cs2005q3.2-glibc-i386"
+do_package "cs2005q3.2-uclibc-arm-eabi" "cs2005q3.2-uclibc-arm-eabi"
 #do_package "cs2005q3.2-uclibc-i386" "cs2005q3.2-uclibc-i386"
 
 for config in $CONFIGS; do
diff -ru cs2005q3-2_toolchain/gcc/uclibc/Makefile i/cs2005q3-2_toolchain/gcc/uclibc/Makefile
--- cs2005q3-2_toolchain/gcc/uclibc/Makefile	2006-05-24 01:05:32.000000000 +0200
+++ i/cs2005q3-2_toolchain/gcc/uclibc/Makefile	2009-11-05 22:23:46.000000000 +0100
@@ -46,7 +46,7 @@
 export CFLAGS = -O2
 
 ifeq ($(ARCH),arm)
-TARGET = arm-none-linux-uclibc
+TARGET = arm-none-linux-uclibcgnueabi
 else
 TARGET = $(SUB_ARCH)-linux-uclibc
 endif
@@ -106,23 +106,22 @@
 	) && \
 	( \
 	    dpkg-source -x ../download/$(LIBC_PKGNAME).dsc && \
-	    cd $(LIBC_PKGDIR) && \
-	    debian/rules patch && \
+	    cd $(LIBC_PKGDIR) \
 	) && \
 	( \
 	    dpkg-source -x ../download/$(GCC_PKGNAME).dsc && \
 	    cd $(GCC_PKGDIR) && \
 	    debian/rules unpack && \
-	    debian/rules patch \
+	    debian/rules patch && \
+	    sed -i "s/ld-linux.so.3/ld-uClibc.so.0/g" src/gcc/config/arm/linux-eabi.h \
 	) && \
 	( \
 	    dpkg-source -x ../download/$(GETTEXT_PKGNAME).dsc && \
-	    cd $(GETTEXT_PKGDIR) && \
-	    debian/rules patch \
+	    cd $(GETTEXT_PKGDIR) \
 	)
 	$(MAKECOOKIE)
 
-configure-toolchain:
+configure-toolchain: install-linux-headers
 	cd work/$(LIBC_SRCDIR); find ./extra/locale/charmaps -name "*.pairs" > extra/locale/codesets.txt
 	cp $(FILEDIR)/$(ARCH)_uClibc_config work/$(LIBC_SRCDIR)/.config
 	cp $(FILEDIR)/uClibc-locale-030818.tgz work/$(LIBC_SRCDIR)/extra/locale
diff -ru cs2005q3-2_toolchain/gcc/uclibc/files/target_modify.sh i/cs2005q3-2_toolchain/gcc/uclibc/files/target_modify.sh
--- cs2005q3-2_toolchain/gcc/uclibc/files/target_modify.sh	2006-04-13 03:09:12.000000000 +0200
+++ i/cs2005q3-2_toolchain/gcc/uclibc/files/target_modify.sh	2009-11-05 21:34:28.000000000 +0100
@@ -5,7 +5,7 @@
 rm -f $HEADERS_SOURCE/asm-$TARGET_ARCH/arch
 rm -f $HEADERS_SOURCE/asm-$TARGET_ARCH/proc
 if [ "${TARGET_ARCH}" = "arm" ]; then
-ln -s arch-sa1100 $HEADERS_SOURCE/asm-$TARGET_ARCH/arch
+ln -s arch-arm $HEADERS_SOURCE/asm-$TARGET_ARCH/arch
 elif [ "${TARGET_ARCH}" = "cris" ]; then
 ln -s arch-v10 $HEADERS_SOURCE/asm-$TARGET_ARCH/arch
 fi
@@ -18,11 +18,11 @@
 touch $HEADERS_SOURCE/linux/version.h
 
 sed -i -e 's,^TARGET_ARCH.*,TARGET_ARCH=\"'$TARGET_ARCH'\",g' $WORKSRC/.config
-if echo "${TARGET}" | grep "eabi" > /dev/null; then
+#if echo "${TARGET}" | grep "eabi" > /dev/null; then
 	sed -i -e 's,^[[:space:]#]*CONFIG_ARM_EABI.*$,CONFIG_ARM_EABI=y,g' $WORKSRC/.config
-else
-	sed -i -e 's,^[[:space:]#]*CONFIG_ARM_EABI.*$,CONFIG_ARM_EABI=n,g' $WORKSRC/.config
-fi
+#else
+#	sed -i -e 's,^[[:space:]#]*CONFIG_ARM_EABI.*$,CONFIG_ARM_EABI=n,g' $WORKSRC/.config
+#fi
 
 sed -i -e 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE=\"'$KERNEL_SOURCE'\",g' $WORKSRC/.config
 sed -i -e 's,^RUNTIME_PREFIX=.*,RUNTIME_PREFIX=\"/\",g' $WORKSRC/.config
diff -ru cs2005q3-2_toolchain/meta/target-kit/Makefile i/cs2005q3-2_toolchain/meta/target-kit/Makefile
--- cs2005q3-2_toolchain/meta/target-kit/Makefile	2006-05-23 19:10:55.000000000 +0200
+++ i/cs2005q3-2_toolchain/meta/target-kit/Makefile	2009-11-05 21:31:45.000000000 +0100
@@ -21,9 +21,9 @@
 	fi
 
 build-all-toolchains: configure
-	$(MAKE) build-toolchain COMPILERGAR=../../gcc/glibc  ARCH=arm  SUB_ARCH=arm  CPU=$(CPU) COMPILERNAME=cs2005q3.2-glibc-arm
-	$(MAKE) build-toolchain COMPILERGAR=../../gcc/glibc  ARCH=i386 SUB_ARCH=i686 CPU=$(CPU) COMPILERNAME=cs2005q3.2-glibc-i386
-#	$(MAKE) build-toolchain COMPILERGAR=../../gcc/uclibc ARCH=arm  SUB_ARCH=arm  CPU=$(CPU) COMPILERNAME=cs2005q3.2-uclibc-arm
+#	$(MAKE) build-toolchain COMPILERGAR=../../gcc/glibc  ARCH=arm  SUB_ARCH=arm  CPU=$(CPU) COMPILERNAME=cs2005q3.2-glibc-arm
+#	$(MAKE) build-toolchain COMPILERGAR=../../gcc/glibc  ARCH=i386 SUB_ARCH=i686 CPU=$(CPU) COMPILERNAME=cs2005q3.2-glibc-i386
+	$(MAKE) build-toolchain COMPILERGAR=../../gcc/uclibc ARCH=arm  SUB_ARCH=arm  CPU=$(CPU) COMPILERNAME=cs2005q3.2-uclibc-arm-eabi
 #	$(MAKE) build-toolchain COMPILERGAR=../../gcc/uclibc ARCH=i386 SUB_ARCH=i386 CPU=$(CPU) COMPILERNAME=cs2005q3.2-uclibc-i386
 
 build-toolchain: