diff --git a/gcc/build.sh b/gcc/build.sh
index c9a6b9a..50beccc 100755
--- a/gcc/build.sh
+++ b/gcc/build.sh
@@ -3,12 +3,13 @@
 # This is a generic build.sh script
 # It can be used nearly unmodified with many packages
 # 
-# The concept of "method" registering and the logic that implements it was shamelessly
-# stolen from jhlj's Compile.sh script :)
+# build.sh helper functions
+. ${BUILDPKG_BASE}/scripts/build.sh.functions
 #
+###########################################################
 # Check the following 4 variables before running the script
 topdir=gcc
-version=3.3.3
+version=3.3.6
 pkgver=1
 source[0]=$topdir-$version.tar.bz2
 ## If there are no patches, simply comment this
@@ -17,16 +18,11 @@ source[0]=$topdir-$version.tar.bz2
 # Source function library
 . ${HOME}/buildpkg/scripts/buildpkg.functions
 
-# Fill in pkginfo values if necessary
-# using pkgname,name,pkgcat,pkgvendor & pkgdesc
-# see $metadir/pkgdef
+# Global settings
+prefix=/usr/local
+configure_args="--prefix=${prefix}/gcc-$version --disable-nls --with-as=/usr/ccs/bin/as --with-ld=/usr/ccs/bin/ld --with-system-zlib --enable-languages=c,c++,f77 --with-cpu=ultrasparc"
 
-# depend is created by build.sh so make sure
-# it's removed by distclean
-META_CLEAN="$META_CLEAN depend"
-
-# We're going to build more than one package from this source
-# define helpervars to do that
+objdir=$srcdir/objdir
 
 # Define abbreviated version number (for pkgdef)
 abbrev_ver=$(echo $version|sed -e 's/\.//g')
@@ -34,14 +30,6 @@ abbrev_ver=$(echo $version|sed -e 's/\.//g')
 # gcc base dir (for pkgdef)
 gccdir=gcc-$version
 
-objdir=$srcdir/objdir
-
-# Define script functions and register them
-METHODS=""
-reg() {
-    METHODS="$METHODS $1"
-}
-
 reg prep
 prep()
 {
@@ -53,7 +41,7 @@ build()
 {
     $MKDIR "$objdir"
     setdir "$objdir"
-    $srcdir/$topsrcdir/configure --prefix=/usr/local/gcc-$version --disable-nls --with-as=/usr/ccs/bin/as --with-ld=/usr/ccs/bin/ld --with-system-zlib --enable-languages=c,c++,f77,java --with-cpu=ultrasparc
+    $srcdir/$topsrcdir/configure $configure_args
     $MAKE_PROG
 }
 
@@ -67,22 +55,20 @@ install()
 reg pack
 pack()
 {
-    usedepend=0	# don't use $metadir/depend file
-
     # We want to create gcc, libstdc++ and libgcc packages
     # Copy files for libgcc package
-    $MKDIR -p $stagedir$prefix/lib
-    $MKDIR -p $stagedir$prefix/lib/sparcv9
-    $CP $stagedir$prefix/$gccdir/lib/libgcc_s* $stagedir$prefix/lib
-    $CP $stagedir$prefix/$gccdir/lib/sparcv9/libgcc_s* $stagedir$prefix/lib/sparcv9
+    $MKDIR -p ${stagedir}${prefix}/lib
+    $MKDIR -p ${stagedir}${prefix}/lib/sparcv9
+    $CP ${stagedir}${prefix}/$gccdir/lib/libgcc_s.so.1 ${stagedir}${prefix}/lib
+    $CP ${stagedir}${prefix}/$gccdir/lib/sparcv9/libgcc_s.so.1 ${stagedir}${prefix}/lib/sparcv9
 
     # Copy files for libstdc++ package
-    $MKDIR -p $stagedir$prefix/lib
-    $MKDIR -p $stagedir$prefix/lib/sparcv9
-    $CP $stagedir$prefix/$gccdir/lib/libstdc++.so* $stagedir$prefix/lib
-    $CP $stagedir$prefix/$gccdir/lib/sparcv9/libstdc++.so* $stagedir$prefix/lib/sparcv9
-    rm -f $stagedir$prefix/lib/libstdc++.so
-    rm -f stagedirlibstdc_stage$prefix/lib/sparcv9/libstdc++.so
+    $MKDIR -p ${stagedir}${prefix}/lib
+    $MKDIR -p ${stagedir}${prefix}/lib/sparcv9
+    $CP ${stagedir}${prefix}/$gccdir/lib/libstdc++.so.* ${stagedir}${prefix}/lib
+    $CP ${stagedir}${prefix}/$gccdir/lib/sparcv9/libstdc++.so.* ${stagedir}${prefix}/lib/sparcv9
+#    rm -f ${stagedir}${prefix}/lib/libstdc++.so
+#    rm -f ${stagedir}${prefix}/lib/sparcv9/libstdc++.so
     
     # now create packages according to pkgdef
     generic_pack
@@ -98,42 +84,4 @@ distclean()
 ###################################################
 # No need to look below here
 ###################################################
-
-reg all
-all()
-{
-    for METHOD in $METHODS 
-    do
-	case $METHOD in
-	     all*|*clean) ;;
-	     *) $METHOD
-		;;
-	esac
-    done
-
-}
-
-reg
-usage() {
-    echo Usage $0 "{"$(echo $METHODS | tr " " "|")"}"
-    exit 1
-}
-
-OK=0
-for METHOD in $*
-do
-    METHOD=" $METHOD *"
-    if [ "${METHODS%$METHOD}" == "$METHODS" ] ; then
-	usage
-    fi
-    OK=1
-done
-
-if [ $OK = 0 ] ; then
-    usage;
-fi
-
-for METHOD in $*
-do
-    ( $METHOD )
-done
+build_sh $*
diff --git a/gcc/meta/pkginfo.in b/gcc/meta/pkginfo.in
deleted file mode 100644
index 95b0128..0000000
--- a/gcc/meta/pkginfo.in
+++ /dev/null
@@ -1,11 +0,0 @@
-PKG="%%pkgname%%"
-NAME="%%name%%"
-ARCH="sparc"
-VERSION="%%version%%"
-CATEGORY="%%pkgcat%%"
-VENDOR="%%pkgvendor%%"
-EMAIL="Tom G. Christenen - tgc@statsbiblioteket.dk"
-PSTAMP="%%pkgver%%"
-BASEDIR="%%topinstalldir%%"
-CLASSES="none"
-DESC="%%pkgdesc%%"