diff --git a/make/uclibc_toolchain.mk b/make/uclibc_toolchain.mk
index 40e8be5a87..d8ccea34a2 100644
--- a/make/uclibc_toolchain.mk
+++ b/make/uclibc_toolchain.mk
@@ -39,8 +39,8 @@ MULTILIB:=--enable-multilib
 #
 #############################################################
 BINUTILS_SITE:=ftp://ftp.gnu.org/gnu/binutils/
-BINUTILS_SOURCE:=binutils-2.13.2.tar.bz2
-BINUTILS_DIR:=$(BUILD_DIR)/binutils-2.13.2
+BINUTILS_SOURCE:=binutils-2.13.2.1.tar.bz2
+BINUTILS_DIR:=$(BUILD_DIR)/binutils-2.13.2.1
 #
 # Perhaps you would perfer to use the older 2.12.1 version?
 #BINUTILS_SITE:=ftp://ftp.gnu.org/gnu/binutils/
@@ -59,8 +59,8 @@ UCLIBC_SITE:=http://www.kernel.org/pub/linux/libs/uclibc
 endif
 
 GCC_SITE:=ftp://ftp.gnu.org/gnu/gcc/
-GCC_SOURCE:=gcc-3.2.1.tar.gz
-GCC_DIR:=$(BUILD_DIR)/gcc-3.2.1
+GCC_SOURCE:=gcc-3.2.2.tar.gz
+GCC_DIR:=$(BUILD_DIR)/gcc-3.2.2
 
 
 
diff --git a/make/uclibc_toolchain_2_95.mk b/make/uclibc_toolchain_2_95.mk
index a2910abfee..4778d7e634 100644
--- a/make/uclibc_toolchain_2_95.mk
+++ b/make/uclibc_toolchain_2_95.mk
@@ -39,8 +39,8 @@ MULTILIB:=--enable-multilib
 #
 #############################################################
 BINUTILS_SITE:=ftp://ftp.gnu.org/gnu/binutils/
-BINUTILS_SOURCE:=binutils-2.13.2.tar.bz2
-BINUTILS_DIR:=$(BUILD_DIR)/binutils-2.13.2
+BINUTILS_SOURCE:=binutils-2.13.2.1.tar.bz2
+BINUTILS_DIR:=$(BUILD_DIR)/binutils-2.13.2.1
 #
 # Perhaps you would perfer to use the older 2.12.1 version?
 #BINUTILS_SITE:=ftp://ftp.gnu.org/gnu/binutils/
diff --git a/sources/gcc-002-swfp.patch b/sources/gcc-002-mips-swfp.patch
similarity index 100%
rename from sources/gcc-002-swfp.patch
rename to sources/gcc-002-mips-swfp.patch
diff --git a/sources/uClibc.config b/sources/uClibc.config
index 7b464a8dab..d1f436f2bc 100644
--- a/sources/uClibc.config
+++ b/sources/uClibc.config
@@ -33,6 +33,7 @@ C_SYMBOL_PREFIX=""
 #
 DOPIC=y
 HAVE_SHARED=y
+# ADD_LIBGCC_FUNCTIONS is not set
 BUILD_UCLIBC_LDSO=y
 LDSO_LDD_SUPPORT=y
 UCLIBC_CTOR_DTOR=y