diff --git a/gcc43/build.sh b/gcc43/build.sh
index 30a55c1..8c90657 100755
--- a/gcc43/build.sh
+++ b/gcc43/build.sh
@@ -8,7 +8,7 @@
 snapshot=
 topdir=gcc
 version=4.3.5
-pkgver=1
+pkgver=2
 source[0]=ftp://ftp.sunet.se/pub/gnu/gcc/releases/$topdir-$version/$topdir-$version.tar.bz2
 #source[0]=gcc-4.3-$snapshot.tar.bz2
 ## If there are no patches, simply comment this
@@ -29,20 +29,23 @@ abbrev_ver=$(echo $version | ${__tr} -d '.')
 # Just major.minor, no subminors
 majorminor=$(echo $version | cut -d. -f1-2)
 
-global_config_args="--prefix=$prefix --with-local-prefix=$prefix --with-libiconv-prefix=$lprefix --with-gmp=$lprefix --with-mpfr=$lprefix --disable-nls --enable-shared"
+global_config_args="--prefix=$prefix --with-local-prefix=$prefix --with-gmp=$lprefix --with-mpfr=$lprefix --disable-nls --enable-shared"
 langs="--enable-languages=c,ada,c++,fortran,objc,obj-c++"
 linker="--without-gnu-ld --with-ld=/usr/ccs/bin/ld"
 assembler="--without-gnu-as --with-as=/usr/ccs/bin/as"
 objdir=all_native
 # platform/arch specific options
 [ "$_os" = "sunos56" -a "$arch" = "i386" ] && assembler="--with-gnu-as --with-as=$lprefix/bin/gas"
-[ "$_os" = "sunos56" ] && { platform_configure_args="--enable-threads=posix95 --enable-obsolete"; sol26=1; }
+[ "$_os" = "sunos56" ] && { platform_configure_args="--with-libiconv-prefix=$lprefix --enable-threads=posix95 --enable-obsolete"; sol26=1; }
 [ "$_os" = "sunos57" ] && { langs="$langs,java --with-java-awt=xlib"; sol27=1; }
 [ "$arch" = "sparc" ] && { vendor="sun"; sparc=1; } || { vendor="pc"; intel=1; }
 [ "$arch" = "sparc" -a -n "$(isalist | grep sparcv9)" ] && { sparcv9=1; m64run=1; } || m64run=0
+[ "$arch" = "sparc" ] && global_config_args="$global_config_args --with-cpu=v7"
 
 configure_args="$global_config_args $linker $assembler $langs $platform_configure_args"
 
+LDFLAGS="-Wl,-R,$prefix/lib -Wl,-R,$lprefix/lib"
+
 export CONFIG_SHELL=/bin/ksh
 
 datestamp()
@@ -65,7 +68,11 @@ build()
     setdir source
     ${__mkdir} -p ../$objdir
     echo "$__configure $configure_args"
-    generic_build ../$objdir
+    setdir ../$objdir
+    ${__configure} $configure_args    
+    ${__make} -j2 LDFLAGS="$LDFLAGS" BOOT_LDFLAGS="$LDFLAGS" $make_build_target
+   #  ${__make} LDFLAGS="$LDFLAGS" BOOT_LDFLAGS="$LDFLAGS"
+    #generic_build ../$objdir
     datestamp
 }
 
@@ -136,6 +143,7 @@ install()
 	compat $pkg 4.3.2 1 2
 	compat $pkg 4.3.3 1 2
 	compat $pkg 4.3.4 1 2
+	compat $pkg 4.3.5 1 2
     done
     compat libobjc2 4.2.3 1 2
     compat libobjc2 4.2.4 1 2
@@ -143,19 +151,23 @@ install()
     compat libobjc2 4.3.2 1 2
     compat libobjc2 4.3.3 1 2
     compat libobjc2 4.3.4 1 2
+    compat libobjc2 4.3.5 1 2
     compat libgomp1 4.2.3 1 2
     compat libgomp1 4.2.4 1 2
     compat libgomp1 4.3.1 1 2
     compat libgomp1 4.3.2 1 2
     compat libgomp1 4.3.3 1 2
     compat libgomp1 4.3.4 1 2
+    compat libgomp1 4.3.5 1 2
     compat libgfortran3 4.3.1 1 2
     compat libgfortran3 4.3.2 1 2
     compat libgfortran3 4.3.3 1 2
     compat libgfortran3 4.3.4 1 2
+    compat libgfortran3 4.3.5 1 2
     compat libgnat43 4.3.2 1 2
     compat libgnat43 4.3.3 1 2
     compat libgnat43 4.3.4 1 2
+    compat libgnat43 4.3.5 1 2
     datestamp
 }
 
diff --git a/gcc43/meta/ChangeLog b/gcc43/meta/ChangeLog
index cfc3bf0..05a3c94 100644
--- a/gcc43/meta/ChangeLog
+++ b/gcc43/meta/ChangeLog
@@ -1,5 +1,11 @@
 CHANGELOG
 ---------
+* Sat May 28 2011 Tom G. Christensen <swpkg@jupiterrise.com> - 4.3.5-2
+- Build for Solaris 7/sparc
+
+* Thu Jul 13 2010 Tom G. Christensen <swpkg@jupiterrise.com> - 4.3.5-1
+- Update to 4.3.5
+
 * Sat May 08 2010 Tom G. Christensen <tgc@jupiterrise.com> - 4.3.4-2
 - Build for Solaris 7/sparc
 - Convert some hardlinks to symlinks to save space
diff --git a/gcc43/meta/pkgdef b/gcc43/meta/pkgdef
index 11a9105..bdf6a5d 100644
--- a/gcc43/meta/pkgdef
+++ b/gcc43/meta/pkgdef
@@ -404,6 +404,8 @@ $iprefix/include/c++/${version}/gcj
 $iprefix/include/c++/${version}/gnu
 $iprefix/include/c++/${version}/java
 $iprefix/include/c++/${version}/javax
+$iprefix/include/c++/${version}/org
+$iprefix/include/c++/${version}/sun
 $iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/gcj/libgcj-config.h
 $iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/jawt.h
 $iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/jawt_md.h