diff --git a/gcc.SlackBuild b/gcc.SlackBuild
index d0af34a..4a868df 100755
--- a/gcc.SlackBuild
+++ b/gcc.SlackBuild
@@ -526,11 +526,18 @@ ln -sf ../../libexec/gcc/${TARGET}/${VERSION}/liblto_plugin.so $PKG1/usr/lib/bfd
 make -i install-info DESTDIR=$PKG1
 
 chmod 755 $PKG1/usr/lib${LIBDIRSUFFIX}/libgcc_s.so.1
+if [ "$ARCH" = "x86_64" ]; then
+  chmod 755 $PKG1/usr/lib/libgcc_s.so.1
+fi
 
 # The (huge) static GNU java libraries are not packaged.  In nearly all
 # cases one or more dependencies will not be available as static anyway.
 rm -f $PKG1/usr/lib${LIBDIRSUFFIX}/libgcj.a
 rm -f $PKG1/usr/lib${LIBDIRSUFFIX}/libgcj-tools.a
+if [ "$ARCH" = "x86_64" ]; then
+  rm -f $PKG1/usr/lib/libgcj.a
+  rm -f $PKG1/usr/lib/libgcj-tools.a
+fi
 
 # Fix stuff up:
 ( cd $PKG1/usr/info ; rm dir ; gzip -9 * )
@@ -597,6 +604,10 @@ rm -f $PKG1/usr/lib${LIBDIRSUFFIX}/libgcj-tools.a
   mv $PKG1/usr/include/c++ usr/include
   mkdir -p usr/lib${LIBDIRSUFFIX}
   mv $PKG1/usr/lib${LIBDIRSUFFIX}/*++* usr/lib${LIBDIRSUFFIX}
+  if [ "$ARCH" = "x86_64" ]; then
+    mkdir -p usr/lib
+    mv $PKG1/usr/lib/*++* usr/lib
+  fi
   mkdir -p usr/libexec/gcc/$TARGET/$VERSION
   mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/cc1plus usr/libexec/gcc/$TARGET/$VERSION/cc1plus
   mkdir -p usr/man/man1
@@ -615,9 +626,18 @@ rm -f $PKG1/usr/lib${LIBDIRSUFFIX}/libgcj-tools.a
   mv $PKG1/usr/info/gfortran* usr/info
   mkdir -p usr/lib${LIBDIRSUFFIX}
   mv $PKG1/usr/lib${LIBDIRSUFFIX}/libgfortran* usr/lib${LIBDIRSUFFIX}
+  if [ "$ARCH" = "x86_64" ]; then
+    mkdir -p usr/lib
+    mv $PKG1/usr/lib/libgfortran* usr/lib
+  fi
   mkdir -p usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION
   mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/finclude usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION
   mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/libgfortran* usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION
+  if [ "$ARCH" = "x86_64" ]; then
+    mkdir -p usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/32
+    mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/32/finclude usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/32
+    mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/32/libgfortran* usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/32
+  fi
   mkdir -p usr/libexec/gcc/$TARGET/$VERSION
   mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/f951 usr/libexec/gcc/$TARGET/$VERSION/f951
   mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/libgfortran* usr/libexec/gcc/$TARGET/$VERSION
@@ -642,6 +662,11 @@ mv $PKG1/usr/bin/gnative2ascii $PKG5/usr/bin
   mkdir -p usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION
   mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/adainclude usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION
   mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/adalib usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION
+  if [ "$ARCH" = "x86_64" ]; then
+    mkdir -p usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/32
+    mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/32/adainclude usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/32
+    mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/32/adalib usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/32
+  fi
 )
 
 # gcc-java:
@@ -703,6 +728,19 @@ mv $PKG1/usr/bin/gnative2ascii $PKG5/usr/bin
   mkdir -p usr/lib${LIBDIRSUFFIX}/pkgconfig
   mv $PKG1/usr/lib${LIBDIRSUFFIX}/pkgconfig/libgcj*.pc usr/lib${LIBDIRSUFFIX}/pkgconfig
   rmdir $PKG1/usr/lib${LIBDIRSUFFIX}/pkgconfig 2> /dev/null
+  if [ "$ARCH" = "x86_64" ]; then
+    mkdir -p usr/lib
+    mv $PKG1/usr/lib/libffi* usr/lib
+    mv $PKG1/usr/lib/logging.properties usr/lib
+    mv $PKG1/usr/lib/gcj* usr/lib
+    mv $PKG1/usr/lib/libgcj* usr/lib
+    mv $PKG1/usr/lib/libgij* usr/lib
+    mv $PKG1/usr/lib/lib-org* usr/lib
+    mv $PKG1/usr/lib/security usr/lib
+    mkdir -p usr/lib/pkgconfig
+    mv $PKG1/usr/lib/pkgconfig/libgcj*.pc usr/lib/pkgconfig
+    rmdir $PKG1/usr/lib/pkgconfig 2> /dev/null
+  fi
   mkdir -p usr/libexec/gcc/$TARGET/$VERSION
   mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/jc1 usr/libexec/gcc/$TARGET/$VERSION
   mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/ecj1 usr/libexec/gcc/$TARGET/$VERSION
@@ -759,6 +797,10 @@ mv $PKG1/usr/bin/gnative2ascii $PKG5/usr/bin
 ( cd $PKG6
   mkdir -p usr/lib${LIBDIRSUFFIX}
   mv $PKG1/usr/lib${LIBDIRSUFFIX}/libobjc* usr/lib${LIBDIRSUFFIX}
+  if [ "$ARCH" = "x86_64" ]; then
+    mkdir -p usr/lib
+    mv $PKG1/usr/lib/libobjc* usr/lib
+  fi
   mkdir -p usr/libexec/gcc/$TARGET/$VERSION
   mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/cc1obj usr/libexec/gcc/$TARGET/$VERSION
   mkdir -p usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include
@@ -789,6 +831,15 @@ mv $PKG1/usr/bin/gnative2ascii $PKG5/usr/bin
   # it is useful for deploying compiled binaries on machines that do not yet
   # have libgo.so.0.0.0.
   mv $PKG1/usr/lib${LIBDIRSUFFIX}/libgo.a usr/lib${LIBDIRSUFFIX}
+  if [ "$ARCH" = "x86_64" ]; then
+    mkdir -p usr/lib
+    mv $PKG1/usr/lib/go usr/lib
+    mv $PKG1/usr/lib/{libgo.la,libgo.so*,libgobegin.a,libgolibbegin.a,libnetgo.a} usr/lib || exit 1
+    # Ordinarily Slackware doesn't package static libraries, but in this case
+    # it is useful for deploying compiled binaries on machines that do not yet
+    # have libgo.so.0.0.0.
+    mv $PKG1/usr/lib/libgo.a usr/lib
+  fi
   mkdir -p usr/man/man1
   mv $PKG1/usr/man/man1/gccgo.1.gz usr/man/man1
   mv $PKG1/usr/man/man1/go.1.gz usr/man/man1