diff --git a/gcc40/build.sh b/gcc40/build.sh
index e1530ad..1b9bb5c 100755
--- a/gcc40/build.sh
+++ b/gcc40/build.sh
@@ -15,7 +15,7 @@ pkgver=1
 source[0]=$topdir-$version.tar.bz2
 [ -n "$snapshot" ] && source[0]=$topdir-$version-$snapshot.tar.bz2
 ## If there are no patches, simply comment this
-#patch[0]=
+patch[0]=gcc-4.0.4-newer-gas.patch
 
 # Source function library
 . ${BUILDPKG_BASE}/scripts/buildpkg.functions
@@ -36,6 +36,7 @@ langs="--enable-languages=c,ada,c++,f95,objc"
 objdir=all_native
 # platform/arch specific options
 [ "$_os" = "sunos56" -a "$arch" = "i386" ] && platform_configure_args="--with-gnu-as --with-as=$lprefix/bin/gas"
+[ "$_os" = "sunos56" -a "$arch" = "i386" ] && platform_configure_args="$platform_configure_args --with-gnu-ld --with-ld=$lprefix/bin/gld"
 [ "$arch" = "sparc" ] && vendor="sun" || vendor="pc"
 
 configure_args="$global_config_args $langs $platform_configure_args"
diff --git a/gcc40/meta/pkgdef b/gcc40/meta/pkgdef
index 014401b..348f364 100644
--- a/gcc40/meta/pkgdef
+++ b/gcc40/meta/pkgdef
@@ -71,6 +71,8 @@ $iprefix/man/?a?7/*.7
 $_sharedir
 # Only on i386
 $iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/*intrin.h
+$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/mm3dnow.h
+$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/mm_malloc.h
 
 [gcc-gnat]
 pkgname="${pkgprefix}g${abbrev_ver}gn"
diff --git a/gcc40/src/gcc-4.0.4-newer-gas.patch b/gcc40/src/gcc-4.0.4-newer-gas.patch
new file mode 100644
index 0000000..e0a7c3c
--- /dev/null
+++ b/gcc40/src/gcc-4.0.4-newer-gas.patch
@@ -0,0 +1,11 @@
+--- gcc-4.0.4/gcc/configure.orig	2008-05-25 16:24:23.893788000 +0200
++++ gcc-4.0.4/gcc/configure	2008-05-25 16:26:23.983888000 +0200
+@@ -13419,7 +13419,7 @@
+   # arbitrary sections are supported and try the test.
+   as_ver=`$gcc_cv_as --version 2>/dev/null | sed 1q`
+   if echo "$as_ver" | grep GNU > /dev/null; then
+-    as_ver=`echo $as_ver | sed -e 's/GNU assembler \([0-9.][0-9.]*\).*/\1/'`
++    as_ver=`echo $as_ver | sed -e 's/GNU assembler.* \([0-9.][0-9.]*\).*/\1/'`
+     as_major=`echo $as_ver | sed 's/\..*//'`
+     as_minor=`echo $as_ver | sed 's/[^.]*\.\([0-9]*\).*/\1/'`
+     if test $as_major -eq 2 && test $as_minor -lt 11