diff --git a/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-gcc.spec
index 4d40b57fd4..cf795a4a8e 100644
--- a/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-gcc.spec
+++ b/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-gcc.spec
@@ -26,7 +26,7 @@ Summary:      	arm-rtems4.9 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	2%{?dist}
+Release:      	3%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -367,9 +367,11 @@ GNU cc compiler for arm-rtems4.9.
 %dir %{gcclib}/arm-rtems4.9/%{gcc_version}/include
 %if "%{gcc_version}" > "4.0.3"
 %if "arm-rtems4.9" != "bfin-rtems4.9"
+%if "arm-rtems4.9" != "avr-rtems4.9"
 %dir %{gcclib}/arm-rtems4.9/%{gcc_version}/include/ssp
 %endif
 %endif
+%endif
 
 %dir %{gccexec}
 %dir %{gccexec}/arm-rtems4.9
diff --git a/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gcc.spec
index ee624c2c22..f45006937d 100644
--- a/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gcc.spec
+++ b/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gcc.spec
@@ -14,9 +14,9 @@
 %endif
 
 
-%define gcc_pkgvers 4.0.3
-%define gcc_version 4.0.3
-%define gcc_rpmvers %{expand:%(echo "4.0.3" | tr - _ )}
+%define gcc_pkgvers 4.0.4
+%define gcc_version 4.0.4
+%define gcc_rpmvers %{expand:%(echo "4.0.4" | tr - _ )}
 
 %define newlib_version		1.15.0
 %define gccnewlib_version	gcc%{gcc_version}newlib%{newlib_version}
@@ -26,7 +26,7 @@ Summary:      	avr-rtems4.9 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	1%{?dist}
+Release:      	2%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,12 +53,9 @@ Requires:	rtems-4.9-avr-rtems4.9-newlib = %{newlib_version}-%{release}
 %define gccexec %{_libdir}/gcc-lib
 %endif
 
-%if "%{gcc_version}" == "3.4.6"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-3.4.6/gcc-core-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.0.3"
+%if "%{gcc_version}" == "4.0.4"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		gcc-core-4.0.3-rtems-20060822.diff
+Patch0:		gcc-core-4.0.4-rtems4.9-20071111.diff
 %endif
 %if "%{gcc_version}" == "4.2.2"
 Source0:	ftp://gcc.gnu.org/pub/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
@@ -361,9 +358,11 @@ GNU cc compiler for avr-rtems4.9.
 %dir %{gcclib}/avr-rtems4.9/%{gcc_version}/include
 %if "%{gcc_version}" > "4.0.3"
 %if "avr-rtems4.9" != "bfin-rtems4.9"
+%if "avr-rtems4.9" != "avr-rtems4.9"
 %dir %{gcclib}/avr-rtems4.9/%{gcc_version}/include/ssp
 %endif
 %endif
+%endif
 
 %dir %{gccexec}
 %dir %{gccexec}/avr-rtems4.9
diff --git a/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-gcc.spec
index 3cb2208ae3..2d6bf8318b 100644
--- a/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-gcc.spec
+++ b/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-gcc.spec
@@ -26,7 +26,7 @@ Summary:      	bfin-rtems4.9 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	2%{?dist}
+Release:      	3%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -361,9 +361,11 @@ GNU cc compiler for bfin-rtems4.9.
 %dir %{gcclib}/bfin-rtems4.9/%{gcc_version}/include
 %if "%{gcc_version}" > "4.0.3"
 %if "bfin-rtems4.9" != "bfin-rtems4.9"
+%if "bfin-rtems4.9" != "avr-rtems4.9"
 %dir %{gcclib}/bfin-rtems4.9/%{gcc_version}/include/ssp
 %endif
 %endif
+%endif
 
 %dir %{gccexec}
 %dir %{gccexec}/bfin-rtems4.9
diff --git a/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-gcc.spec
index d70d6ac640..96295fce4f 100644
--- a/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-gcc.spec
+++ b/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-gcc.spec
@@ -26,7 +26,7 @@ Summary:      	h8300-rtems4.9 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	2%{?dist}
+Release:      	3%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -367,9 +367,11 @@ GNU cc compiler for h8300-rtems4.9.
 %dir %{gcclib}/h8300-rtems4.9/%{gcc_version}/include
 %if "%{gcc_version}" > "4.0.3"
 %if "h8300-rtems4.9" != "bfin-rtems4.9"
+%if "h8300-rtems4.9" != "avr-rtems4.9"
 %dir %{gcclib}/h8300-rtems4.9/%{gcc_version}/include/ssp
 %endif
 %endif
+%endif
 
 %dir %{gccexec}
 %dir %{gccexec}/h8300-rtems4.9
diff --git a/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-gcc.spec
index 7b4a65ee95..b14eb6ee4c 100644
--- a/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-gcc.spec
+++ b/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-gcc.spec
@@ -26,7 +26,7 @@ Summary:      	i386-rtems4.9 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	2%{?dist}
+Release:      	3%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -367,9 +367,11 @@ GNU cc compiler for i386-rtems4.9.
 %dir %{gcclib}/i386-rtems4.9/%{gcc_version}/include
 %if "%{gcc_version}" > "4.0.3"
 %if "i386-rtems4.9" != "bfin-rtems4.9"
+%if "i386-rtems4.9" != "avr-rtems4.9"
 %dir %{gcclib}/i386-rtems4.9/%{gcc_version}/include/ssp
 %endif
 %endif
+%endif
 
 %dir %{gccexec}
 %dir %{gccexec}/i386-rtems4.9
diff --git a/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gcc.spec
index aded7c0aef..d62f3b47bb 100644
--- a/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gcc.spec
+++ b/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gcc.spec
@@ -26,7 +26,7 @@ Summary:      	m68k-rtems4.9 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	2%{?dist}
+Release:      	3%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -367,9 +367,11 @@ GNU cc compiler for m68k-rtems4.9.
 %dir %{gcclib}/m68k-rtems4.9/%{gcc_version}/include
 %if "%{gcc_version}" > "4.0.3"
 %if "m68k-rtems4.9" != "bfin-rtems4.9"
+%if "m68k-rtems4.9" != "avr-rtems4.9"
 %dir %{gcclib}/m68k-rtems4.9/%{gcc_version}/include/ssp
 %endif
 %endif
+%endif
 
 %dir %{gccexec}
 %dir %{gccexec}/m68k-rtems4.9
diff --git a/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-gcc.spec
index a7d59394b9..383c5d6246 100644
--- a/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-gcc.spec
+++ b/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-gcc.spec
@@ -26,7 +26,7 @@ Summary:      	mips-rtems4.9 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	2%{?dist}
+Release:      	3%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -367,9 +367,11 @@ GNU cc compiler for mips-rtems4.9.
 %dir %{gcclib}/mips-rtems4.9/%{gcc_version}/include
 %if "%{gcc_version}" > "4.0.3"
 %if "mips-rtems4.9" != "bfin-rtems4.9"
+%if "mips-rtems4.9" != "avr-rtems4.9"
 %dir %{gcclib}/mips-rtems4.9/%{gcc_version}/include/ssp
 %endif
 %endif
+%endif
 
 %dir %{gccexec}
 %dir %{gccexec}/mips-rtems4.9
diff --git a/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-gcc.spec
index 95a9827a47..2c36b7e9dd 100644
--- a/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-gcc.spec
+++ b/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-gcc.spec
@@ -26,7 +26,7 @@ Summary:      	powerpc-rtems4.9 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	2%{?dist}
+Release:      	3%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -367,9 +367,11 @@ GNU cc compiler for powerpc-rtems4.9.
 %dir %{gcclib}/powerpc-rtems4.9/%{gcc_version}/include
 %if "%{gcc_version}" > "4.0.3"
 %if "powerpc-rtems4.9" != "bfin-rtems4.9"
+%if "powerpc-rtems4.9" != "avr-rtems4.9"
 %dir %{gcclib}/powerpc-rtems4.9/%{gcc_version}/include/ssp
 %endif
 %endif
+%endif
 
 %dir %{gccexec}
 %dir %{gccexec}/powerpc-rtems4.9
diff --git a/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-gcc.spec
index cf021e8fd7..fe0c576f2c 100644
--- a/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-gcc.spec
+++ b/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-gcc.spec
@@ -26,7 +26,7 @@ Summary:      	sh-rtems4.9 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	2%{?dist}
+Release:      	3%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -367,9 +367,11 @@ GNU cc compiler for sh-rtems4.9.
 %dir %{gcclib}/sh-rtems4.9/%{gcc_version}/include
 %if "%{gcc_version}" > "4.0.3"
 %if "sh-rtems4.9" != "bfin-rtems4.9"
+%if "sh-rtems4.9" != "avr-rtems4.9"
 %dir %{gcclib}/sh-rtems4.9/%{gcc_version}/include/ssp
 %endif
 %endif
+%endif
 
 %dir %{gccexec}
 %dir %{gccexec}/sh-rtems4.9
diff --git a/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-gcc.spec
index 777674faa2..c761bb5791 100644
--- a/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-gcc.spec
+++ b/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-gcc.spec
@@ -26,7 +26,7 @@ Summary:      	sparc-rtems4.9 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	2%{?dist}
+Release:      	3%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -367,9 +367,11 @@ GNU cc compiler for sparc-rtems4.9.
 %dir %{gcclib}/sparc-rtems4.9/%{gcc_version}/include
 %if "%{gcc_version}" > "4.0.3"
 %if "sparc-rtems4.9" != "bfin-rtems4.9"
+%if "sparc-rtems4.9" != "avr-rtems4.9"
 %dir %{gcclib}/sparc-rtems4.9/%{gcc_version}/include/ssp
 %endif
 %endif
+%endif
 
 %dir %{gccexec}
 %dir %{gccexec}/sparc-rtems4.9