diff --git a/contrib/crossrpms/freebsd5.2/Makefile.am b/contrib/crossrpms/freebsd5.2/Makefile.am
index 6fa7906eed..7bb59a1062 100644
--- a/contrib/crossrpms/freebsd5.2/Makefile.am
+++ b/contrib/crossrpms/freebsd5.2/Makefile.am
@@ -85,7 +85,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 "/--with-newlib/d" \
-	  -e "/^%package -n @tool_target@-gcc/d" \
+	  -e "/^%package -n @rpmprefix@@tool_target@-gcc/d" \
 	  -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 93c7888985..95313ecef4 100644
--- a/contrib/crossrpms/freebsd6.0/Makefile.am
+++ b/contrib/crossrpms/freebsd6.0/Makefile.am
@@ -85,7 +85,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 "/--with-newlib/d" \
-	  -e "/^%package -n @tool_target@-gcc/d" \
+	  -e "/^%package -n @rpmprefix@@tool_target@-gcc/d" \
 	  -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 07226466a9..7b0e077619 100644
--- a/contrib/crossrpms/rtems/Makefile.am
+++ b/contrib/crossrpms/rtems/Makefile.am
@@ -59,7 +59,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add
 	  -e "s,[@]_prefix[@],$(prefix),g" \
 	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
 	  -e "s,rtems[@]osversion[@],rtems,g" \
-	  -e "/^%package -n @tool_target@-gcc/d" \
+	  -e "/^%package -n @rpmprefix@@tool_target@-gcc/d" \
 	  -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 8d8886a6c4..1c6b964e17 100644
--- a/contrib/crossrpms/solaris2.7/Makefile.am
+++ b/contrib/crossrpms/solaris2.7/Makefile.am
@@ -84,7 +84,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 "/--with-newlib/d" \
-	  -e "/^%package -n @tool_target@-gcc/d" \
+	  -e "/^%package -n @rpmprefix@@tool_target@-gcc/d" \
 	  -e 's,^%define build_newlib.*$$,%define build_newlib 0,' \
 	  > $(TARGET)-gcc.spec.in
 CLEANFILES += $(TARGET)-gcc.spec.in