diff --git a/contrib/crossrpms/cygwin/Makefile.am b/contrib/crossrpms/cygwin/Makefile.am
index c0d328a230..7b9171a662 100644
--- a/contrib/crossrpms/cygwin/Makefile.am
+++ b/contrib/crossrpms/cygwin/Makefile.am
@@ -5,6 +5,21 @@ TARGET = i686-pc-cygwin
 noinst_DATA =
 CLEANFILES =
 
+CYGWIN_VERS = 1.5.19-4
+CYGWIN_RPMREL = 0
+
+$(TARGET)-libs.spec: libs.spec.in
+	sed -e "/[@]INSTALL_POST[@]/r ../common/installpost.add" \
+	  -e "/[@]INSTALL_POST[@]/d" \
+	  -e "/[@]FIND_REQPROV[@]/r ../common/find-reqprov.add" \
+	  -e "/[@]FIND_REQPROV[@]/d" \
+	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
+	  -e "s/[@]CYGWIN_VERS[@]/$(CYGWIN_VERS)/g" \
+	  -e "s/[@]CYGWIN_RPMREL[@]/$(CYGWIN_RPMREL)/g" \
+	  $(srcdir)/libs.spec.in > $@
+CLEANFILES += $(TARGET)-libs.spec
+noinst_DATA += $(TARGET)-libs.spec
+
 
 BINUTILS_VERS = 20050610-1
 BINUTILS_RPMREL = 0.20060214.0
@@ -16,8 +31,8 @@ BINUTILS_SUBPACKAGES += $(top_builddir)/common/clean.add
 BINUTILS_SUBPACKAGES += ../binutils/target-binutils.add
 BINUTILS_SUBPACKAGES += ../binutils/base-binutils.add
 
-$(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES)
-	cat $^ | sed \
+$(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) binutils-sources.add
+	cat $(BINUTILS_SUBPACKAGES) | sed \
 	  -e "/[@]SOURCES[@]/r ./binutils-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
 	  -e '/^%define _prefix.*$$/d' \
@@ -39,3 +54,39 @@ $(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
 	  $(srcdir)/$(TARGET)-binutils.spec.in > $@
 CLEANFILES += $(TARGET)-binutils.spec
 noinst_DATA += $(TARGET)-binutils.spec
+
+
+GCC_VERS = 3.4.4-1
+GCC_RPMREL = 0.20060213.0
+
+GCC_SUBPACKAGES = $(top_builddir)/common/common.add
+GCC_SUBPACKAGES += ../gcc/gccnewlib.add
+GCC_SUBPACKAGES += ../gcc/install.add
+GCC_SUBPACKAGES += ../gcc/rpm-install.add
+GCC_SUBPACKAGES += $(top_builddir)/common/clean.add
+GCC_SUBPACKAGES += ../gcc/target-gcc.add
+GCC_SUBPACKAGES += ../gcc/base-gcc.add
+GCC_SUBPACKAGES += ../gcc/target-c++.add
+
+$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) gcc-sources.add
+	cat $(GCC_SUBPACKAGES) | sed \
+	  -e "/[@]SOURCES[@]/r ./gcc-sources.add" \
+	  -e "/[@]SOURCES[@]/d" \
+	  -e '/^%define _prefix.*$$/d' \
+	  -e '/^%define rpmgroup.*$$/d' \
+	  -e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \
+	  -e "s,= %{newlib_version}-%{release},," \
+	  -e "s,[@]rpmprefix[@],,g" \
+	  -e "s,rtems[@]osversion[@],rtems,g" \
+	  -e "s,%{rpmgroup},Development/Tools,g" \
+	  > $(TARGET)-gcc.spec.in
+CLEANFILES += $(TARGET)-gcc.spec.in
+
+$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
+	sed \
+	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
+	  -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
+	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \
+	  $(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 cbc33ec4a1..aec6b6748e 100644
--- a/contrib/crossrpms/freebsd5.2/Makefile.am
+++ b/contrib/crossrpms/freebsd5.2/Makefile.am
@@ -2,8 +2,27 @@
 
 TARGET = i586-pc-freebsd5.2
 
+noinst_DATA =
+CLEANFILES =
+
+FREEBSD_VERS = 5.2.1
+FREEBSD_RPMREL = 0.20060209.1
+
+$(TARGET)-libs.spec: libs.spec.in
+	sed -e "/[@]INSTALL_POST[@]/r ../common/installpost.add" \
+	  -e "/[@]INSTALL_POST[@]/d" \
+	  -e "/[@]FIND_REQPROV[@]/r ../common/find-reqprov.add" \
+	  -e "/[@]FIND_REQPROV[@]/d" \
+	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
+	  -e "s/[@]FREEBSD_VERS[@]/$(FREEBSD_VERS)/g" \
+	  -e "s/[@]FREEBSD_RPMREL[@]/$(FREEBSD_RPMREL)/g" \
+	  $(srcdir)/libs.spec.in > $@
+CLEANFILES += $(TARGET)-libs.spec
+noinst_DATA += $(TARGET)-libs.spec
+
+
 BINUTILS_VERS = 2.16.1
-BINUTILS_RPMREL = 0.20060214.0
+BINUTILS_RPMREL = 0.20060215.0
 
 BINUTILS_SUBPACKAGES = $(top_builddir)/common/common.add
 BINUTILS_SUBPACKAGES += ../binutils/binutils.add
@@ -12,8 +31,8 @@ BINUTILS_SUBPACKAGES += $(top_builddir)/common/clean.add
 BINUTILS_SUBPACKAGES += ../binutils/target-binutils.add
 BINUTILS_SUBPACKAGES += ../binutils/base-binutils.add
 
-$(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES)
-	cat $^ | sed \
+$(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) binutils-sources.add
+	cat $(BINUTILS_SUBPACKAGES) | sed \
 	  -e "/[@]SOURCES[@]/r ./binutils-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
 	  -e '/^%define _prefix.*$$/d' \
@@ -35,3 +54,49 @@ $(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
 	  $(srcdir)/$(TARGET)-binutils.spec.in > $@
 CLEANFILES += $(TARGET)-binutils.spec
 noinst_DATA += $(TARGET)-binutils.spec
+
+
+GCC_VERS = 4.0.2
+GCC_RPMREL = 0.20060213.0
+
+GCC_SUBPACKAGES = $(top_builddir)/common/common.add
+GCC_SUBPACKAGES += ../gcc/gccnewlib.add
+GCC_SUBPACKAGES += ../gcc/install.add
+GCC_SUBPACKAGES += ../gcc/rpm-install.add
+GCC_SUBPACKAGES += $(top_builddir)/common/clean.add
+GCC_SUBPACKAGES += ../gcc/target-gcc.add
+GCC_SUBPACKAGES += ../gcc/base-gcc.add
+GCC_SUBPACKAGES += ../gcc/target-c++.add
+
+$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) gcc-sources.add
+	cat $(GCC_SUBPACKAGES) | sed \
+	  -e "/[@]SOURCES[@]/r ./gcc-sources.add" \
+	  -e "/[@]SOURCES[@]/d" \
+	  -e '/^%define _prefix.*$$/d' \
+	  -e '/^%define rpmgroup.*$$/d' \
+	  -e '/^%define gcc_target.*$$/d' \
+	  -e "s,[@]rpmprefix[@],,g" \
+	  -e "s,rtems[@]osversion[@],rtems,g" \
+	  -e "s,%{rpmgroup},Development/Tools,g" \
+	  -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 's,^%define build_newlib.*$$,%define build_newlib 0,' \
+	  > $(TARGET)-gcc.spec.in
+CLEANFILES += $(TARGET)-gcc.spec.in
+
+$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
+	sed \
+	  -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" \
+	  $(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 19ea98a7ad..61cae4d90f 100644
--- a/contrib/crossrpms/freebsd6.0/Makefile.am
+++ b/contrib/crossrpms/freebsd6.0/Makefile.am
@@ -5,6 +5,21 @@ TARGET = i586-pc-freebsd6.0
 noinst_DATA =
 CLEANFILES =
 
+FREEBSD_VERS = 6.0
+FREEBSD_RPMREL = 0.20060213.0
+
+$(TARGET)-libs.spec: libs.spec.in
+	sed -e "/[@]INSTALL_POST[@]/r ../common/installpost.add" \
+	  -e "/[@]INSTALL_POST[@]/d" \
+	  -e "/[@]FIND_REQPROV[@]/r ../common/find-reqprov.add" \
+	  -e "/[@]FIND_REQPROV[@]/d" \
+	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
+	  -e "s/[@]FREEBSD_VERS[@]/$(FREEBSD_VERS)/g" \
+	  -e "s/[@]FREEBSD_RPMREL[@]/$(FREEBSD_RPMREL)/g" \
+	  $(srcdir)/libs.spec.in > $@
+CLEANFILES += $(TARGET)-libs.spec
+noinst_DATA += $(TARGET)-libs.spec
+
 
 BINUTILS_VERS = 2.16.1
 BINUTILS_RPMREL = 0.20060214.0
@@ -16,8 +31,8 @@ BINUTILS_SUBPACKAGES += $(top_builddir)/common/clean.add
 BINUTILS_SUBPACKAGES += ../binutils/target-binutils.add
 BINUTILS_SUBPACKAGES += ../binutils/base-binutils.add
 
-$(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES)
-	cat $^ | sed \
+$(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) binutils-sources.add
+	cat $(BINUTILS_SUBPACKAGES) | sed \
 	  -e "/[@]SOURCES[@]/r ./binutils-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
 	  -e '/^%define _prefix.*$$/d' \
@@ -39,3 +54,49 @@ $(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
 	  $(srcdir)/$(TARGET)-binutils.spec.in > $@
 CLEANFILES += $(TARGET)-binutils.spec
 noinst_DATA += $(TARGET)-binutils.spec
+
+
+GCC_VERS = 4.0.2
+GCC_RPMREL = 0.20060213.0
+
+GCC_SUBPACKAGES = $(top_builddir)/common/common.add
+GCC_SUBPACKAGES += ../gcc/gccnewlib.add
+GCC_SUBPACKAGES += ../gcc/install.add
+GCC_SUBPACKAGES += ../gcc/rpm-install.add
+GCC_SUBPACKAGES += $(top_builddir)/common/clean.add
+GCC_SUBPACKAGES += ../gcc/target-gcc.add
+GCC_SUBPACKAGES += ../gcc/base-gcc.add
+GCC_SUBPACKAGES += ../gcc/target-c++.add
+
+$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) gcc-sources.add
+	cat $(GCC_SUBPACKAGES) | sed \
+	  -e "/[@]SOURCES[@]/r ./gcc-sources.add" \
+	  -e "/[@]SOURCES[@]/d" \
+	  -e '/^%define _prefix.*$$/d' \
+	  -e '/^%define rpmgroup.*$$/d' \
+	  -e '/^%define gcc_target.*$$/d' \
+	  -e "s,[@]rpmprefix[@],,g" \
+	  -e "s,rtems[@]osversion[@],rtems,g" \
+	  -e "s,%{rpmgroup},Development/Tools,g" \
+	  -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 's,^%define build_newlib.*$$,%define build_newlib 0,' \
+	  > $(TARGET)-gcc.spec.in
+CLEANFILES += $(TARGET)-gcc.spec.in
+
+$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
+	sed \
+	  -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" \
+	  $(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 393c4b6a7c..f4169e6a5c 100644
--- a/contrib/crossrpms/mingw32/Makefile.am
+++ b/contrib/crossrpms/mingw32/Makefile.am
@@ -5,6 +5,58 @@ TARGET = i686-pc-mingw32
 noinst_DATA =
 CLEANFILES =
 
+MINGW32_VERS = 3.9
+MINGW32_RPMREL = 0.20060215.0
+
+LIBS_SUBPACKAGES = $(top_builddir)/common/common.add
+LIBS_SUBPACKAGES += libs.add
+LIBS_SUBPACKAGES += ../gcc/rpm-install.add
+LIBS_SUBPACKAGES += $(top_builddir)/common/clean.add
+LIBS_SUBPACKAGES += target-libs.add
+
+$(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES)
+	cat $(LIBS_SUBPACKAGES) | sed \
+	  -e '/^%define _prefix.*$$/d' \
+	  -e '/^%define rpmgroup.*$$/d' \
+	  -e "s,[@]rpmprefix[@],,g" \
+	> $(TARGET)-libs.spec.in
+CLEANFILES += $(TARGET)-libs.spec.in
+	                      
+$(TARGET)-libs.spec: $(TARGET)-libs.spec.in
+	sed \
+	  -e "s/@tool_target@/$(TARGET)/g" \
+	  -e "s/[@]MINGW32_VERS[@]/$(MINGW32_VERS)/g" \
+	  -e "s/[@]MINGW32_RPMREL[@]/$(MINGW32_RPMREL)/g" \
+	  $(srcdir)/$(TARGET)-libs.spec.in > $@
+CLEANFILES += $(TARGET)-libs.spec
+noinst_DATA += $(TARGET)-libs.spec
+
+W32API_VERS = 3.6
+W32API_RPMREL = 0.20060215.0
+
+W32API_SUBPACKAGES = $(top_builddir)/common/common.add
+W32API_SUBPACKAGES += w32api.add
+W32API_SUBPACKAGES += ../gcc/rpm-install.add
+W32API_SUBPACKAGES += $(top_builddir)/common/clean.add
+W32API_SUBPACKAGES += target-w32api.add
+
+$(TARGET)-w32api.spec.in: $(W32API_SUBPACKAGES)
+	cat $(W32API_SUBPACKAGES) | sed \
+	  -e '/^%define _prefix.*$$/d' \
+	  -e '/^%define rpmgroup.*$$/d' \
+	  -e "s,[@]rpmprefix[@],,g" \
+	> $(TARGET)-w32api.spec.in
+CLEANFILES += $(TARGET)-w32api.spec.in
+	                      
+$(TARGET)-w32api.spec: $(TARGET)-w32api.spec.in
+	sed \
+	  -e "s/@tool_target@/$(TARGET)/g" \
+	  -e "s/[@]W32API_VERS[@]/$(W32API_VERS)/g" \
+	  -e "s/[@]W32API_RPMREL[@]/$(W32API_RPMREL)/g" \
+	  $(srcdir)/$(TARGET)-w32api.spec.in > $@
+CLEANFILES += $(TARGET)-w32api.spec
+noinst_DATA += $(TARGET)-w32api.spec
+
 
 BINUTILS_VERS = 2.16.91-20060119-1
 BINUTILS_RPMREL = 0.20060214.0
@@ -16,8 +68,8 @@ BINUTILS_SUBPACKAGES += $(top_builddir)/common/clean.add
 BINUTILS_SUBPACKAGES += ../binutils/target-binutils.add
 BINUTILS_SUBPACKAGES += ../binutils/base-binutils.add
 
-$(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES)
-	cat $^ | sed \
+$(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) binutils-sources.add
+	cat $(BINUTILS_SUBPACKAGES) | sed \
 	  -e "/[@]SOURCES[@]/r ./binutils-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
 	  -e '/^%define _prefix.*$$/d' \
@@ -39,3 +91,42 @@ $(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
 	  $(srcdir)/$(TARGET)-binutils.spec.in > $@
 CLEANFILES += $(TARGET)-binutils.spec
 noinst_DATA += $(TARGET)-binutils.spec
+
+
+GCC_VERS = 4.0.2
+GCC_RPMREL = 0.20060213.0
+
+GCC_SUBPACKAGES = $(top_builddir)/common/common.add
+GCC_SUBPACKAGES += ../gcc/gccnewlib.add
+GCC_SUBPACKAGES += ../gcc/install.add
+GCC_SUBPACKAGES += ../gcc/rpm-install.add
+GCC_SUBPACKAGES += $(top_builddir)/common/clean.add
+GCC_SUBPACKAGES += ../gcc/target-gcc.add
+GCC_SUBPACKAGES += ../gcc/base-gcc.add
+GCC_SUBPACKAGES += ../gcc/target-c++.add
+
+$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) gcc-sources.add
+	cat $(GCC_SUBPACKAGES) | sed \
+	  -e "/[@]SOURCES[@]/r ./gcc-sources.add" \
+	  -e "/[@]SOURCES[@]/d" \
+	  -e '/^%define _prefix.*$$/d' \
+	  -e '/^%define rpmgroup.*$$/d' \
+	  -e '/^%define gcc_target.*$$/d' \
+	  -e "s,[@]rpmprefix[@],,g" \
+	  -e "s,rtems[@]osversion[@],rtems,g" \
+	  -e "s,%{rpmgroup},Development/Tools,g" \
+	  -e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \
+	  -e "s,= %{newlib_version}-%{release},," \
+	  -e "/^%package -n @tool_target@-gcc/d" \
+	  -e 's,^%define build_newlib.*$$,%define build_newlib 0,' \
+	  > $(TARGET)-gcc.spec.in
+CLEANFILES += $(TARGET)-gcc.spec.in
+
+$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
+	sed \
+	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
+	  -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
+	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \
+	  $(srcdir)/$(TARGET)-gcc.spec.in > $@
+CLEANFILES += $(TARGET)-gcc.spec
+noinst_DATA += $(TARGET)-gcc.spec
diff --git a/contrib/crossrpms/rtems/Makefile.am b/contrib/crossrpms/rtems/Makefile.am
index a318c85324..eba0ec7ffb 100644
--- a/contrib/crossrpms/rtems/Makefile.am
+++ b/contrib/crossrpms/rtems/Makefile.am
@@ -44,13 +44,13 @@ GCC_VERS = 4.0.2
 GCC_RPMREL = 0.20060215.0
 
 GCC_SUBPACKAGES = $(top_builddir)/common/common.add
-GCC_SUBPACKAGES += ../gccnewlib/gccnewlib.add
-GCC_SUBPACKAGES += ../gccnewlib/install.add
-GCC_SUBPACKAGES += ../gccnewlib/rpm-install.add
+GCC_SUBPACKAGES += ../gcc/gccnewlib.add
+GCC_SUBPACKAGES += ../gcc/install.add
+GCC_SUBPACKAGES += ../gcc/rpm-install.add
 GCC_SUBPACKAGES += $(top_builddir)/common/clean.add
-GCC_SUBPACKAGES += ../gccnewlib/target-gcc.add
-GCC_SUBPACKAGES += ../gccnewlib/base-gcc.add
-GCC_SUBPACKAGES += ../gccnewlib/target-c++.add
+GCC_SUBPACKAGES += ../gcc/target-gcc.add
+GCC_SUBPACKAGES += ../gcc/base-gcc.add
+GCC_SUBPACKAGES += ../gcc/target-c++.add
 
 $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) gcc-sources.add
 	cat $(GCC_SUBPACKAGES) | sed \
diff --git a/contrib/crossrpms/solaris2.7/Makefile.am b/contrib/crossrpms/solaris2.7/Makefile.am
index 49ed2cd0bb..51a259d630 100644
--- a/contrib/crossrpms/solaris2.7/Makefile.am
+++ b/contrib/crossrpms/solaris2.7/Makefile.am
@@ -60,13 +60,13 @@ GCC_VERS = 4.0.2
 GCC_RPMREL = 0.20060213.0
 
 GCC_SUBPACKAGES = $(top_builddir)/common/common.add
-GCC_SUBPACKAGES += ../gccnewlib/gccnewlib.add
-GCC_SUBPACKAGES += ../gccnewlib/install.add
-GCC_SUBPACKAGES += ../gccnewlib/rpm-install.add
+GCC_SUBPACKAGES += ../gcc/gccnewlib.add
+GCC_SUBPACKAGES += ../gcc/install.add
+GCC_SUBPACKAGES += ../gcc/rpm-install.add
 GCC_SUBPACKAGES += $(top_builddir)/common/clean.add
-GCC_SUBPACKAGES += ../gccnewlib/target-gcc.add
-GCC_SUBPACKAGES += ../gccnewlib/base-gcc.add
-GCC_SUBPACKAGES += ../gccnewlib/target-c++.add
+GCC_SUBPACKAGES += ../gcc/target-gcc.add
+GCC_SUBPACKAGES += ../gcc/base-gcc.add
+GCC_SUBPACKAGES += ../gcc/target-c++.add
 
 $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) gcc-sources.add
 	cat $(GCC_SUBPACKAGES) | sed \