diff --git a/contrib/crossrpms/cygwin/Makefile.am b/contrib/crossrpms/cygwin/Makefile.am
index a2efe01954..d35a42c082 100644
--- a/contrib/crossrpms/cygwin/Makefile.am
+++ b/contrib/crossrpms/cygwin/Makefile.am
@@ -48,7 +48,7 @@ $(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
 	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
 	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
 	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
-	  -e "s,[@]PATCH0[@],," \
+	  -e "/[@]PATCH/d" \
 	  $(srcdir)/$(TARGET)-binutils.spec.in > $@
 CLEANFILES += $(TARGET)-binutils.spec
 noinst_DATA += $(TARGET)-binutils.spec
@@ -83,6 +83,7 @@ $(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
 	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
 	  -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
 	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \
+	  -e "/[@]PATCH/d" \
 	  $(srcdir)/$(TARGET)-gcc.spec.in > $@
 CLEANFILES += $(TARGET)-gcc.spec
 noinst_DATA += $(TARGET)-gcc.spec
diff --git a/contrib/crossrpms/freebsd5.2/Makefile.am b/contrib/crossrpms/freebsd5.2/Makefile.am
index f38b8e43c6..9926d98e72 100644
--- a/contrib/crossrpms/freebsd5.2/Makefile.am
+++ b/contrib/crossrpms/freebsd5.2/Makefile.am
@@ -48,7 +48,7 @@ $(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
 	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
 	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
 	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
-	  -e "s,[@]PATCH0[@],," \
+	  -e "/[@]PATCH/d" \
 	  $(srcdir)/$(TARGET)-binutils.spec.in > $@
 CLEANFILES += $(TARGET)-binutils.spec
 noinst_DATA += $(TARGET)-binutils.spec
@@ -87,12 +87,7 @@ $(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
 	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
 	  -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
 	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \
-	  -e "/@PATCH0@/d" \
-	  -e "/@PATCH1@/d" \
-	  -e "/@PATCH2@/d" \
-	  -e "/@PATCH3@/d" \
-	  -e "/@PATCH4@/d" \
-	  -e "/@PATCH5@/d" \
+	  -e "/[@]PATCH/d" \
 	  $(srcdir)/$(TARGET)-gcc.spec.in > $@
 CLEANFILES += $(TARGET)-gcc.spec
 noinst_DATA += $(TARGET)-gcc.spec
diff --git a/contrib/crossrpms/freebsd6.0/Makefile.am b/contrib/crossrpms/freebsd6.0/Makefile.am
index dde76035be..8614e32b8c 100644
--- a/contrib/crossrpms/freebsd6.0/Makefile.am
+++ b/contrib/crossrpms/freebsd6.0/Makefile.am
@@ -48,7 +48,7 @@ $(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
 	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
 	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
 	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
-	  -e "s,[@]PATCH0[@],," \
+	  -e "/[@]PATCH/d" \
 	  $(srcdir)/$(TARGET)-binutils.spec.in > $@
 CLEANFILES += $(TARGET)-binutils.spec
 noinst_DATA += $(TARGET)-binutils.spec
@@ -87,12 +87,7 @@ $(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
 	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
 	  -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
 	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \
-	  -e "/@PATCH0@/d" \
-	  -e "/@PATCH1@/d" \
-	  -e "/@PATCH2@/d" \
-	  -e "/@PATCH3@/d" \
-	  -e "/@PATCH4@/d" \
-	  -e "/@PATCH5@/d" \
+	  -e "/[@]PATCH/d" \
 	  $(srcdir)/$(TARGET)-gcc.spec.in > $@
 CLEANFILES += $(TARGET)-gcc.spec
 noinst_DATA += $(TARGET)-gcc.spec
diff --git a/contrib/crossrpms/mingw32/Makefile.am b/contrib/crossrpms/mingw32/Makefile.am
index fac2526ff4..c885a7c9cf 100644
--- a/contrib/crossrpms/mingw32/Makefile.am
+++ b/contrib/crossrpms/mingw32/Makefile.am
@@ -83,7 +83,7 @@ $(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
 	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
 	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
 	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
-	  -e "s,[@]PATCH0[@],," \
+	  -e "/[@]PATCH/d" \
 	  $(srcdir)/$(TARGET)-binutils.spec.in > $@
 CLEANFILES += $(TARGET)-binutils.spec
 noinst_DATA += $(TARGET)-binutils.spec
diff --git a/contrib/crossrpms/rtems/Makefile.am b/contrib/crossrpms/rtems/Makefile.am
index f93a9d1f60..ed972eb78d 100644
--- a/contrib/crossrpms/rtems/Makefile.am
+++ b/contrib/crossrpms/rtems/Makefile.am
@@ -33,6 +33,7 @@ $(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
 	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
 	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
 	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
+	  -e "/[@]PATCH/d" \
 	  $(srcdir)/$(TARGET)-binutils.spec.in > $@
 CLEANFILES += $(TARGET)-binutils.spec
 noinst_DATA += $(TARGET)-binutils.spec
@@ -68,12 +69,7 @@ $(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
 	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
 	  -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
 	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \
-	  -e "/@PATCH0@/d" \
-	  -e "/@PATCH1@/d" \
-	  -e "/@PATCH2@/d" \
-	  -e "/@PATCH3@/d" \
-	  -e "/@PATCH4@/d" \
-	  -e "/@PATCH5@/d" \
+	  -e "/[@]PATCH/d" \
 	  $(srcdir)/$(TARGET)-gcc.spec.in > $@
 CLEANFILES += $(TARGET)-gcc.spec
 noinst_DATA += $(TARGET)-gcc.spec
diff --git a/contrib/crossrpms/solaris2.7/Makefile.am b/contrib/crossrpms/solaris2.7/Makefile.am
index ae7797e5f2..1ff711b2c6 100644
--- a/contrib/crossrpms/solaris2.7/Makefile.am
+++ b/contrib/crossrpms/solaris2.7/Makefile.am
@@ -48,7 +48,7 @@ $(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
 	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
 	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
 	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
-	  -e "s,[@]PATCH0[@],," \
+	  -e "/[@]PATCH/d" \
 	  $(srcdir)/$(TARGET)-binutils.spec.in > $@
 CLEANFILES += $(TARGET)-binutils.spec
 noinst_DATA += $(TARGET)-binutils.spec
@@ -87,12 +87,7 @@ $(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
 	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
 	  -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
 	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \
-	  -e "/@PATCH0@/d" \
-	  -e "/@PATCH1@/d" \
-	  -e "/@PATCH2@/d" \
-	  -e "/@PATCH3@/d" \
-	  -e "/@PATCH4@/d" \
-	  -e "/@PATCH5@/d" \
+	  -e "/[@]PATCH/d" \
 	  $(srcdir)/$(TARGET)-gcc.spec.in > $@
 CLEANFILES += $(TARGET)-gcc.spec
 noinst_DATA += $(TARGET)-gcc.spec