diff --git a/bzip2/build.sh b/bzip2/build.sh
index ac52175..953c2e4 100755
--- a/bzip2/build.sh
+++ b/bzip2/build.sh
@@ -6,26 +6,31 @@
 ###########################################################
 # Check the following 4 variables before running the script
 topdir=bzip2
-version=1.0.5
+version=1.0.6
 pkgver=1
-source[0]=$topdir-$version.tar.gz
+source[0]=http://bzip.org/${version}/$topdir-$version.tar.gz
 # If there are no patches, simply comment this
-patch[0]=bzip2-1.0.5-saneso.patch
+patch[0]=bzip2-1.0.6-sane_soname.patch
 
 # Source function library
 . ${BUILDPKG_SCRIPTS}/buildpkg.functions
 
+# Global settings
+shortroot=1
+
 reg prep
 prep()
 {
     generic_prep
+    # Solaris ld needs -h instead of -soname
+    ${__gsed} -i 's/-soname/-h/g' Makefile-libbz2_so
 }
 
 reg build
 build()
 {
     setdir source
-    ${__make} -f Makefile-libbz2_so CC="gcc -R$prefix/lib" CFLAGS="-D_FILE_OFFSET_BITS=64 -fpic -fPIC"
+    ${__make} -f Makefile-libbz2_so CC="gcc -R$prefix/lib"
     rm -f *.o
     ${__make} -f Makefile LDFLAGS="-R$prefix/lib"
 }
@@ -39,29 +44,29 @@ check()
 reg install
 install()
 {
-    clean stage
+    generic_install PREFIX
+
     setdir source
-    ${__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 shared library
+    ${__install} -m 755 libbz2.so.${version} ${stagedir}${prefix}/${_libdir}
+    ${__ln} -s libbz2.so.${version} ${stagedir}${prefix}/${_libdir}/libbz2.so.1
+    ${__ln} -s libbz2.so.1 ${stagedir}${prefix}/${_libdir}/libbz2.so
+
+    # Install dynamically linked bzip2 binary
     ${__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/
+    ${__rm} -f ${stagedir}${prefix}/${_bindir}/b{unzip2,zcat}
     ${__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
+
+    custom_install=1
+    generic_install PREFIX
 
     doc LICENSE CHANGES README README.COMPILATION.PROBLEMS
     docs_for bzip2-devel manual.html
+
+    ${__mv} ${stagedir}${prefix}/man ${stagedir}${prefix}/share
+
+    compat bzip2 1.0.5 1 1
 }
 
 reg pack
diff --git a/bzip2/meta/ChangeLog b/bzip2/meta/ChangeLog
new file mode 100644
index 0000000..e4b5c72
--- /dev/null
+++ b/bzip2/meta/ChangeLog
@@ -0,0 +1,4 @@
+CHANGELOG
+---------
+* Wed Nov 20 2013 Tom G. Christensen <swpkg@jupiterrise.com> - 1.0.6-1
+- Update to 1.0.6
diff --git a/bzip2/src/bzip2-1.0.5-saneso.patch b/bzip2/src/bzip2-1.0.5-saneso.patch
deleted file mode 100644
index 119b355..0000000
--- a/bzip2/src/bzip2-1.0.5-saneso.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-*** 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-1.0.6-sane_soname.patch b/bzip2/src/bzip2-1.0.6-sane_soname.patch
new file mode 100644
index 0000000..4c0d700
--- /dev/null
+++ b/bzip2/src/bzip2-1.0.6-sane_soname.patch
@@ -0,0 +1,21 @@
+diff -up bzip2-1.0.6/Makefile-libbz2_so.orig bzip2-1.0.6/Makefile-libbz2_so
+--- bzip2-1.0.6/Makefile-libbz2_so.orig	2012-05-20 14:59:29.220018000 +0200
++++ bzip2-1.0.6/Makefile-libbz2_so	2012-05-20 15:01:03.570001000 +0200
+@@ -35,13 +35,13 @@ OBJS= blocksort.o  \
+       bzlib.o
+ 
+ all: $(OBJS)
+-	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS)
++	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.6 $(OBJS)
+ 	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6
+-	rm -f libbz2.so.1.0
+-	ln -s libbz2.so.1.0.6 libbz2.so.1.0
++	rm -f libbz2.so.1
++	ln -s libbz2.so.1.0.6 libbz2.so.1
+ 
+ clean: 
+-	rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared
++	rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1 bzip2-shared
+ 
+ blocksort.o: blocksort.c
+ 	$(CC) $(CFLAGS) -c blocksort.c