diff --git a/contrib/crossrpms/cygwin/binutils.am b/contrib/crossrpms/cygwin/binutils.am
index 6ca8c7dba4..f480431e82 100644
--- a/contrib/crossrpms/cygwin/binutils.am
+++ b/contrib/crossrpms/cygwin/binutils.am
@@ -12,14 +12,14 @@ BINUTILS_SUBPACKAGES += $(top_srcdir)/common/clean.add
 BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/target-binutils.add
 BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/base-binutils.add
 
-$(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am $(srcdir)/binutils-sources.add
+$(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am $(srcdir)/binutils-sources.add $(srcdir)/../binutils.am
 	cat $(BINUTILS_SUBPACKAGES) | sed \
 	  -e "/[@]SOURCES[@]/r $(srcdir)/binutils-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
 	  | $(MKSPEC0) \
 	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
 	  -e "s/[@]BINUTILS_PKGVERS[@]/$(BINUTILS_PKGVERS)/g" \
-	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
+	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)%{?dist}/g" \
 	  > $(TARGET)-binutils.spec.in
 CLEANFILES += $(TARGET)-binutils.spec.in
 
diff --git a/contrib/crossrpms/cygwin/gcc.am b/contrib/crossrpms/cygwin/gcc.am
index 026e9a8f83..51b12a66e0 100644
--- a/contrib/crossrpms/cygwin/gcc.am
+++ b/contrib/crossrpms/cygwin/gcc.am
@@ -17,7 +17,7 @@ GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-gfortran.add
 GCC_SUBPACKAGES += $(top_srcdir)/gcc/base-gfortran.add
 GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-objc.add
 
-$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add $(srcdir)/../gcc-prep.add
+$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add $(srcdir)/../gcc-prep.add $(srcdir)/../gcc.am
 	cat $(GCC_SUBPACKAGES) | sed \
 	  -e "/[@]SOURCES[@]/r $(srcdir)/gcc-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
@@ -25,7 +25,8 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
 	  -e "/[@]PREP[@]/d" \
 	  -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
 	  -e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \
-	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \
+	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \
+	  -e "/[@]tool_target[@]-newlib/d" \
 	  -e "/^BuildRequ.*[@]tool_target[@]-w32api-sys-root/d" \
 	  -e "s,[@]tool_target[@]-w32api-sys-root,@tool_target@-w32api," \
 	  | $(MKSPEC0) > $(TARGET)-gcc.spec.in
diff --git a/contrib/crossrpms/cygwin/mpfr.am b/contrib/crossrpms/cygwin/mpfr.am
index da89f57e01..1f9e76e7c0 100644
--- a/contrib/crossrpms/cygwin/mpfr.am
+++ b/contrib/crossrpms/cygwin/mpfr.am
@@ -7,7 +7,7 @@ MPFR_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
 MPFR_SUBPACKAGES += $(top_srcdir)/common/clean.add
 MPFR_SUBPACKAGES += $(srcdir)/target-mpfr.add
 
-$(TARGET)-mpfr.spec.in: $(MPFR_SUBPACKAGES) Makefile.am
+$(TARGET)-mpfr.spec.in: $(MPFR_SUBPACKAGES) Makefile.am $(srcdir)/../mpfr.am
 	cat $(MPFR_SUBPACKAGES) | sed \
 	  -e "s/[@]MPFR_VERS[@]/$(MPFR_VERS)/g" \
 	  -e "s/[@]MPFR_RPMREL[@]/$(MPFR_RPMREL)/g" \