diff --git a/gcc/build.sh b/gcc/build.sh
index 0aa38bd..e557497 100755
--- a/gcc/build.sh
+++ b/gcc/build.sh
@@ -9,7 +9,7 @@
 # Check the following 4 variables before running the script
 topdir=gcc
 version=3.3.1
-pkgver=1bu
+pkgver=2bu
 source[0]=$topdir-$version.tar.bz2
 ## If there are no patches, simply comment this
 #patch[0]=
@@ -18,14 +18,14 @@ source[0]=$topdir-$version.tar.bz2
 . ${HOME}/buildpkg/scripts/buildpkg.functions
 
 # Define abbreviated version number
-abbrev_ver=331
+abbrev_ver=$(echo $version|sed -e 's/\.//g') #331
 
 # Fill in pkginfo values if necessary
 # using pkgname,name,pkgcat,pkgvendor & pkgdesc
 pkgname="$pkgprefix""gcc""$abbrev_ver"
 name="GCC - GNU Compiler Collection"
 pkgvendor="http://gcc.gnu.org"
-pkgdesc="GNU Compiler Collection"
+pkgdesc="GNU Compiler Collection (C, C++)"
 
 # depend is created by build.sh so make sure
 # it's removed by distclean
@@ -35,12 +35,12 @@ META_CLEAN="$META_CLEAN depend"
 # define helpervars to do that
 libgcc_stage=$BUILDPKG_BASE/$topdir/stage.libgcc
 gcc_dir=$prefix/gcc-$version
-libgcc_pkgname="$pkgprefix""libgcc"
+libgcc_pkgname="$pkgprefix""libgcc""$abbrev_ver"
 libgcc_name="libgcc - GCC runtime support"
 libgcc_pkgcat="library"
 libgcc_pkgvendor="http://gcc.gnu.org"
 libgcc_pkgdesc="Runtime support for programs built with gcc 3.x"
-libgcc_pkgver="1bu_$abbrev_ver"
+libgcc_pkgver="2bu"
 
 libstdc_stage=$BUILDPKG_BASE/$topdir/stage.libstdc
 libstdc_pkgname="$pkgprefix""libstdc""$abbrev_ver"
@@ -48,9 +48,12 @@ libstdc_name="libstdc++ - GCC runtime support"
 libstdc_pkgcat="library"
 libstdc_pkgvendor="http://gcc.gnu.org"
 libstdc_pkgdesc="Runtime support for c++ programs built with gcc $version"
-libstdc_pkgver="1bu"
+libstdc_pkgver="2bu"
 
 MV=/usr/bin/mv
+CP=/usr/bin/cp
+
+objdir=$srcdir/objdir
 
 # Define script functions and register them
 METHODS=""
@@ -67,9 +70,8 @@ prep()
 reg build
 build()
 {
-    setdir $srcdir
-    $MKDIR objdir
-    setdir "$srcdir/objdir"
+    $MKDIR "$objdir"
+    setdir "$objdir"
     $srcdir/$topsrcdir/configure --prefix=/usr/local/gcc-$version --disable-nls --with-as=/usr/local/bin/as --with-ld=/usr/local/bin/ld --with-system-zlib --enable-languages=c,c++
     $MAKE_PROG
 }
@@ -77,32 +79,33 @@ build()
 reg install
 install()
 {
-    setdir $srcdir/objdir
+    setdir $objdir
     $MAKE_PROG DESTDIR=$stagedir install
 }
 
 reg pack
 pack()
 {
+    usedepend=0	# don't use $metadir/depend file
+
     # We want to create gcc, libstdc++ and libgcc packages
-    # Move files for libgcc package
+    # Copy files for libgcc package
     $MKDIR -p $libgcc_stage$prefix/lib
     $MKDIR -p $libgcc_stage$prefix/lib/sparcv9
-    $MV $stagedir$gcc_dir/lib/libgcc_s* $libgcc_stage$prefix/lib
-    $MV $stagedir$gcc_dir/lib/sparcv9/libgcc_s* $libgcc_stage$prefix/lib/sparcv9
+    $CP $stagedir$gcc_dir/lib/libgcc_s* $libgcc_stage$prefix/lib
+    $CP $stagedir$gcc_dir/lib/sparcv9/libgcc_s* $libgcc_stage$prefix/lib/sparcv9
 
-    # Move files for libstdc++ package
+    # Copy files for libstdc++ package
     $MKDIR -p $libstdc_stage$prefix/lib
     $MKDIR -p $libstdc_stage$prefix/lib/sparcv9
-    cp $stagedir$gcc_dir/lib/libstdc++.so* $libstdc_stage$prefix/lib
-    cp $stagedir$gcc_dir/lib/sparcv9/libstdc++.so* $libstdc_stage$prefix/lib/sparcv9
+    $CP $stagedir$gcc_dir/lib/libstdc++.so* $libstdc_stage$prefix/lib
+    $CP $stagedir$gcc_dir/lib/sparcv9/libstdc++.so* $libstdc_stage$prefix/lib/sparcv9
     rm -f $libstdc_stage$prefix/lib/libstdc++.so.5
     rm -f $libstdc_stage$prefix/lib/sparcv9/libstdc++.so.5
     rm -f $libstdc_stage$prefix/lib/libstdc++.so
     rm -f $libstdc_stage$prefix/lib/sparcv9/libstdc++.so
     
-    # now create gcc package and make sure it depends on libstdc++331
-    echo "P $libgcc_pkgname	$libgcc_pkgdesc" > $metadir/depend # Create dependency file
+    # now create gcc package
     generic_pack
 
     # Prepare for libgcc package
@@ -116,7 +119,6 @@ pack()
     pkgver=$libgcc_pkgver
 
     distfile=libgcc-$version-$pkgver.sb-$os-$cpu-$pkgdirdesig
-    usedepend=0	# don't use $metadir/depend file
     generic_pack # don't embed any pre/post scripts
 
     # Prepare for libstdc++ package
@@ -150,6 +152,7 @@ distclean()
     clean meta
     pkgname=$libstdc_pkgname
     clean meta
+    $RM -rf $objdir
 }
 
 ###################################################
diff --git a/gcc/meta/pkginfo.in b/gcc/meta/pkginfo.in
new file mode 100644
index 0000000..95b0128
--- /dev/null
+++ b/gcc/meta/pkginfo.in
@@ -0,0 +1,11 @@
+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%%"