diff --git a/bzip2/build.sh b/bzip2/build.sh
index b8fa09d..a4240b4 100755
--- a/bzip2/build.sh
+++ b/bzip2/build.sh
@@ -3,33 +3,21 @@
 # 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=bzip2
-version=1.0.2
-pkgver=2
+version=1.0.5
+pkgver=1
 source[0]=$topdir-$version.tar.gz
 # If there are no patches, simply comment this
-patch[0]=bzip2-braindead-solaris-linker.patch
+patch[0]=bzip2-1.0.5-saneso.patch
 
 # Source function library
 . ${BUILDPKG_BASE}/scripts/buildpkg.functions
 
-# Fill in pkginfo values if necessary
-# using pkgname,name,pkgcat,pkgvendor & pkgdesc
-name="bzip2"
-pkgcat="application"
-pkgvendor="http://sources.redhat.com/bzip2/"
-pkgdesc="A freely available, high-quality data compressor"
-
-# Define script functions and register them
-METHODS=""
-reg() {
-    METHODS="$METHODS $1"
-}
-
 reg prep
 prep()
 {
@@ -40,33 +28,49 @@ reg build
 build()
 {
     setdir source
-    export LD_RUN_PATH=$prefix/lib
-    $MAKE_PROG -f Makefile-libbz2_so CFLAGS="-O2 -pipe -mcpu=ultrasparc -mtune=ultrasparc -D_FILE_OFFSET_BITS=64 -fpic -fPIC" all
-    $MAKE_PROG -f Makefile CFLAGS="-O2 -pipe -mcpu=ultrasparc -mtune=ultrasparc -D_FILE_OFFSET_BITS=64" all
+    ${__make} -f Makefile-libbz2_so CC="gcc -R$prefix/lib" CFLAGS="-D_FILE_OFFSET_BITS=64 -fpic -fPIC"
+    rm -f *.o
+    ${__make} -f Makefile LDFLAGS="-R$prefix/lib"
+}
+
+reg check
+check()
+{
+    generic_check
 }
 
 reg install
 install()
 {
-    generic_install PREFIX
+    clean stage
     setdir source
-    $MKDIR -p $stagedir/share/doc/$topdir-$version
-    DOCS="LICENSE CHANGES README README.COMPILATION.PROBLEMS Y2K_INFO"
-    for i in $DOCS
-    do
-	$CP $i $stagedir/share/doc/$topdir-$version
-    done
-    $CP libbz2.so* $stagedir/lib
-    $RM $stagedir/lib/libbz2.a
-    setdir $stagedir/lib
-    ln -sf libbz2.so.1.0.2 libbz2.so.1.0
-    ln -sf libbz2.so.1.0 libbz2.so
+    ${__mkdir} -p ${stagedir}${prefix}/{${_bindir},${_mandir}/man1,${_libdir},${_includedir}}
+    ${__install} -m 755 bzlib.h ${stagedir}${prefix}/${_includedir}
+    ${__install} -m 755 libbz2.so.1.0.4 ${stagedir}${prefix}/${_libdir}
+    ${__install} -m 755 libbz2.a ${stagedir}${prefix}/${_libdir}
+    ${__install} -m 755 bzip2-shared  ${stagedir}${prefix}/${_bindir}/bzip2
+    ${__install} -m 755 bzip2recover bzgrep bzdiff bzmore ${stagedir}${prefix}/${_bindir}/
+    ${__install} -m 644 bzip2.1 bzdiff.1 bzgrep.1 bzmore.1 ${stagedir}${prefix}/${_mandir}/man1/
+    ${__ln} -s bzip2 ${stagedir}${prefix}/${_bindir}/bunzip2
+    ${__ln} -s bzip2 ${stagedir}${prefix}/${_bindir}/bzcat
+    ${__ln} -s bzdiff ${stagedir}${prefix}/${_bindir}/bzcmp
+    ${__ln} -s bzmore ${stagedir}${prefix}/${_bindir}/bzless
+    ${__ln} -s libbz2.so.1.0.4 ${stagedir}${prefix}/${_libdir}/libbz2.so.1
+    ${__ln} -s libbz2.so.1 ${stagedir}${prefix}/${_libdir}/libbz2.so
+    ${__ln} -s bzip2.1 ${stagedir}${prefix}/${_mandir}/man1/bzip2recover.1
+    ${__ln} -s bzip2.1 ${stagedir}${prefix}/${_mandir}/man1/bunzip2.1
+    ${__ln} -s bzip2.1 ${stagedir}${prefix}/${_mandir}/man1/bzcat.1
+    ${__ln} -s bzdiff.1 ${stagedir}${prefix}/${_mandir}/man1/bzcmp.1
+    ${__ln} -s bzmore.1 ${stagedir}${prefix}/${_mandir}/man1/bzless.1
+
+    doc LICENSE CHANGES README README.COMPILATION.PROBLEMS
+    docs_for bzip2-devel manual.html
 }
 
 reg pack
 pack()
 {
-    generic_pack shortroot
+    generic_pack
 }
 
 reg distclean
@@ -78,42 +82,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/bzip2/meta/depend b/bzip2/meta/depend
new file mode 100644
index 0000000..edc4e91
--- /dev/null
+++ b/bzip2/meta/depend
@@ -0,0 +1 @@
+TGCbzip2d bzip2 auto
diff --git a/bzip2/meta/pkgdef b/bzip2/meta/pkgdef
new file mode 100644
index 0000000..d1ecebc
--- /dev/null
+++ b/bzip2/meta/pkgdef
@@ -0,0 +1,26 @@
+[bzip2]
+pkgname="${pkgprefix}${topdir}"
+name="$topdir - The bzip2 compression library and utilities"
+pkgcat="system"
+pkgvendor="http://www.bzip.org"
+shortdesc="A library implementing bzip2 compression and utilities using it"
+pkgver="$pkgver"
+files(-,root,bin)
+default_docs
+$_bindir
+$_libdir/*.so.*
+$_mandir/man1
+
+[bzip2-devel]
+pkgname="${pkgprefix}${topdir}d"
+name="${topdir}-devel - Development support for bzip2"
+pkgcat="system"
+pkgvendor="http://www.bzip.org"
+shortdesc="Files needed for developing with bzip2"
+pkgver="$pkgver"
+files(-,root,bin)
+default_docs
+$_includedir
+$_libdir/*.so
+$_libdir/*.a
+
diff --git a/bzip2/meta/pkginfo.in b/bzip2/meta/pkginfo.in
deleted file mode 100644
index 95b0128..0000000
--- a/bzip2/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%%"
diff --git a/bzip2/meta/relnotes b/bzip2/meta/relnotes
new file mode 100644
index 0000000..c3b73f6
--- /dev/null
+++ b/bzip2/meta/relnotes
@@ -0,0 +1,28 @@
+PACKAGE DETAILS
+---------------
+Name:	    %%PKGNAME%%
+Version:    %%SOURCE_AND_VER%%
+Vendor:	    %%VENDOR%%
+Packager:   %%PKGEDBY%%
+
+Source (sha1sum):
+%%SOURCE_SHA1SUM%%
+
+BUILD DETAILS
+-------------
+Compiler:
+%%COMPILER%%
+
+Environment:
+%%ENVIRONMENT%%
+
+Configure:
+%%CONFIGURE%%
+
+KNOWN DEPENDENCIES
+------------------
+%%DEPENDENCIES%%
+
+ERRORS/MISCELLANEOUS
+--------------------
+A patch was applied to change the soname from libbz2.so.1.0 to libbz2.so.1.
diff --git a/bzip2/src/bzip2-1.0.5-saneso.patch b/bzip2/src/bzip2-1.0.5-saneso.patch
new file mode 100644
index 0000000..119b355
--- /dev/null
+++ b/bzip2/src/bzip2-1.0.5-saneso.patch
@@ -0,0 +1,19 @@
+*** bzip2-1.0.5/Makefile-libbz2_so.orig	Sat Apr 26 11:42:11 2008
+--- bzip2-1.0.5/Makefile-libbz2_so	Sat Apr 26 11:45:11 2008
+***************
+*** 35,41 ****
+        bzlib.o
+  
+  all: $(OBJS)
+! 	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.4 $(OBJS)
+  	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.4
+  	rm -f libbz2.so.1.0
+  	ln -s libbz2.so.1.0.4 libbz2.so.1.0
+--- 35,41 ----
+        bzlib.o
+  
+  all: $(OBJS)
+! 	$(CC) -shared -Wl,-h -Wl,libbz2.so.1 -o libbz2.so.1.0.4 $(OBJS)
+  	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.4
+  	rm -f libbz2.so.1.0
+  	ln -s libbz2.so.1.0.4 libbz2.so.1.0
diff --git a/bzip2/src/bzip2-braindead-solaris-linker.patch b/bzip2/src/bzip2-braindead-solaris-linker.patch
deleted file mode 100644
index 4a73846..0000000
--- a/bzip2/src/bzip2-braindead-solaris-linker.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bzip2-1.0.2/Makefile-libbz2_so.orig	2004-01-09 10:17:44.310014000 +0100
-+++ bzip2-1.0.2/Makefile-libbz2_so	2004-01-09 10:17:57.600005000 +0100
-@@ -20,7 +20,7 @@
-       bzlib.o
- 
- all: $(OBJS)
--	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.2 $(OBJS)
-+	$(CC) -shared -Wl,-h -Wl,libbz2.so.1.0 -o libbz2.so.1.0.2 $(OBJS)
- 	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.2
- 	rm -f libbz2.so.1.0
- 	ln -s libbz2.so.1.0.2 libbz2.so.1.0