diff --git a/contrib/crossrpms/cygwin/Makefile.am b/contrib/crossrpms/cygwin/Makefile.am
index 03c2927e5c..5ae7c6d0c8 100644
--- a/contrib/crossrpms/cygwin/Makefile.am
+++ b/contrib/crossrpms/cygwin/Makefile.am
@@ -81,10 +81,13 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add
 	  -e "/[@]SOURCES[@]/r ./gcc-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
 	  -e "s,[@]_prefix[@],$(prefix),g" \
-	  -e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \
-	  -e "s,[=<][ ]*%{newlib_version}-%{release},," \
 	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
 	  -e "s,rtems[@]osversion[@],rtems,g" \
+	  -e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \
+	  -e "s,[=<][ ]*%{newlib_version}-%{release},," \
+	  -e "/^%package -n @rpmprefix@@tool_target@-gcc/d" \
+	  -e "s/-n @rpmprefix@@tool_target@-gcc//" \
+	  -e 's,^%define build_newlib.*$$,%define build_newlib 0,' \
 	  > $(TARGET)-gcc.spec.in
 CLEANFILES += $(TARGET)-gcc.spec.in
 
diff --git a/contrib/crossrpms/freebsd5.2/Makefile.am b/contrib/crossrpms/freebsd5.2/Makefile.am
index 7bb59a1062..d0968cbc4f 100644
--- a/contrib/crossrpms/freebsd5.2/Makefile.am
+++ b/contrib/crossrpms/freebsd5.2/Makefile.am
@@ -86,6 +86,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add
 	  -e "s,[=<][ ]*%{newlib_version}-%{release},," \
 	  -e "/--with-newlib/d" \
 	  -e "/^%package -n @rpmprefix@@tool_target@-gcc/d" \
+	  -e "s/-n @rpmprefix@@tool_target@-gcc//" \
 	  -e 's,^%define build_newlib.*$$,%define build_newlib 0,' \
 	  > $(TARGET)-gcc.spec.in
 CLEANFILES += $(TARGET)-gcc.spec.in
diff --git a/contrib/crossrpms/freebsd6.0/Makefile.am b/contrib/crossrpms/freebsd6.0/Makefile.am
index 95313ecef4..fd9b51c747 100644
--- a/contrib/crossrpms/freebsd6.0/Makefile.am
+++ b/contrib/crossrpms/freebsd6.0/Makefile.am
@@ -86,6 +86,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add
 	  -e "s,[=<][ ]*%{newlib_version}-%{release},," \
 	  -e "/--with-newlib/d" \
 	  -e "/^%package -n @rpmprefix@@tool_target@-gcc/d" \
+	  -e "s/-n @rpmprefix@@tool_target@-gcc//" \
 	  -e 's,^%define build_newlib.*$$,%define build_newlib 0,' \
 	  > $(TARGET)-gcc.spec.in
 CLEANFILES += $(TARGET)-gcc.spec.in
diff --git a/contrib/crossrpms/mingw32/Makefile.am b/contrib/crossrpms/mingw32/Makefile.am
index d68f54a514..f6825f5944 100644
--- a/contrib/crossrpms/mingw32/Makefile.am
+++ b/contrib/crossrpms/mingw32/Makefile.am
@@ -6,7 +6,7 @@ noinst_DATA =
 CLEANFILES =
 
 MINGW32_VERS = 3.9
-MINGW32_RPMREL = 0.20060217.0
+MINGW32_RPMREL = 0.20060218.0
 
 LIBS_SUBPACKAGES = $(top_builddir)/common/common.add
 LIBS_SUBPACKAGES += libs.add
@@ -31,7 +31,7 @@ CLEANFILES += $(TARGET)-libs.spec
 noinst_DATA += $(TARGET)-libs.spec
 
 W32API_VERS = 3.6
-W32API_RPMREL = 0.20060217.0
+W32API_RPMREL = 0.20060218.0
 
 W32API_SUBPACKAGES = $(top_builddir)/common/common.add
 W32API_SUBPACKAGES += w32api.add
@@ -57,7 +57,7 @@ noinst_DATA += $(TARGET)-w32api.spec
 
 
 BINUTILS_VERS = 2.16.91-20060119-1
-BINUTILS_RPMREL = 0.20060217.0
+BINUTILS_RPMREL = 0.20060218.0
 
 BINUTILS_SUBPACKAGES = $(top_builddir)/common/common.add
 BINUTILS_SUBPACKAGES += ../binutils/binutils.add
@@ -89,7 +89,7 @@ noinst_DATA += $(TARGET)-binutils.spec
 
 
 GCC_VERS = 4.0.2
-GCC_RPMREL = 0.20060217.0
+GCC_RPMREL = 0.20060218.0
 
 GCC_SUBPACKAGES = $(top_builddir)/common/common.add
 GCC_SUBPACKAGES += ../gcc/gccnewlib.add
@@ -110,6 +110,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add
 	  -e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \
 	  -e "s,[=<][ ]*%{newlib_version}-%{release},," \
 	  -e "/^%package -n @rpmprefix@@tool_target@-gcc/d" \
+	  -e "s/-n @rpmprefix@@tool_target@-gcc//" \
 	  -e 's,^%define build_newlib.*$$,%define build_newlib 0,' \
 	  > $(TARGET)-gcc.spec.in
 CLEANFILES += $(TARGET)-gcc.spec.in
diff --git a/contrib/crossrpms/rtems/Makefile.am b/contrib/crossrpms/rtems/Makefile.am
index 7b0e077619..fb3cdcf1ca 100644
--- a/contrib/crossrpms/rtems/Makefile.am
+++ b/contrib/crossrpms/rtems/Makefile.am
@@ -60,6 +60,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add
 	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
 	  -e "s,rtems[@]osversion[@],rtems,g" \
 	  -e "/^%package -n @rpmprefix@@tool_target@-gcc/d" \
+	  -e "s/-n @rpmprefix@@tool_target@-gcc//" \
 	  -e 's,^%define build_newlib.*$$,%define build_newlib 1,' \
 	  > $(TARGET)-gcc.spec.in
 CLEANFILES += $(TARGET)-gcc.spec.in
diff --git a/contrib/crossrpms/solaris2.7/Makefile.am b/contrib/crossrpms/solaris2.7/Makefile.am
index 1c6b964e17..ae672819f6 100644
--- a/contrib/crossrpms/solaris2.7/Makefile.am
+++ b/contrib/crossrpms/solaris2.7/Makefile.am
@@ -85,6 +85,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add
 	  -e "s,[=<][ ]*%{newlib_version}-%{release},," \
 	  -e "/--with-newlib/d" \
 	  -e "/^%package -n @rpmprefix@@tool_target@-gcc/d" \
+	  -e "s/-n @rpmprefix@@tool_target@-gcc//" \
 	  -e 's,^%define build_newlib.*$$,%define build_newlib 0,' \
 	  > $(TARGET)-gcc.spec.in
 CLEANFILES += $(TARGET)-gcc.spec.in