diff --git a/bzip2-32/.footprint b/bzip2-32/.footprint
index fa96e9a3..4a122c87 100644
--- a/bzip2-32/.footprint
+++ b/bzip2-32/.footprint
@@ -1,6 +1,6 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib32/
 -rw-r--r--	root/root	usr/lib32/libbz2.a
-lrwxrwxrwx	root/root	usr/lib32/libbz2.so -> libbz2.so.1.0
-lrwxrwxrwx	root/root	usr/lib32/libbz2.so.1.0 -> libbz2.so.1.0.6
--rwxr-xr-x	root/root	usr/lib32/libbz2.so.1.0.6
+lrwxrwxrwx	root/root	usr/lib32/libbz2.so -> libbz2.so.1.0.8
+lrwxrwxrwx	root/root	usr/lib32/libbz2.so.1.0 -> libbz2.so.1.0.8
+-rw-r--r--	root/root	usr/lib32/libbz2.so.1.0.8
diff --git a/bzip2-32/.signature b/bzip2-32/.signature
index 452081bb..02bb19a6 100644
--- a/bzip2-32/.signature
+++ b/bzip2-32/.signature
@@ -1,7 +1,5 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXVat5PUY0HIpcaV60rEgkLFc5LG6qMjUNx7PbpnEjX/nqZtv6qJmykdHjGTwq8x357LaUIcswrJai7k0ydvx8As=
-SHA256 (Pkgfile) = 2e829f9676b38e6cb424a6108b4b94b3802658b7987ae3ad53a00c65648a3f02
-SHA256 (.footprint) = 14e78943cc31fbae38e4ec6c8b3aeaa7afdc2dd29948006833478f1a52707f89
-SHA256 (bzip2-1.0.6.tar.gz) = a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd
-SHA256 (bzip2.patch) = b8aa64ff17bc5704cbaf2b7012086575acfa6557c89fafdcc6dcd847fb29b5cf
-SHA256 (CVE-2016-3189.patch) = 5c1cce66d2d1dfa61a627734c1a00bf0441c5ab6be0458676e20787705a14a6b
+RWSwxGo/zH7eXXquFG3j7u6B5yrAlURNNpoN68J37rxuWJdQwbdXtgFqt/HVVOb1Tgbv+DquDNadyIoPVvHrG0pFlFc9A85wzAQ=
+SHA256 (Pkgfile) = c0ed5c49f8dcea522731e3a4f46c4e36971b4829fbccc756ad799063ee0580c7
+SHA256 (.footprint) = ae64a6b0f0690f2699e12f5d0abbfd0b9ad60e9cea31f76641a43e00c749a5e8
+SHA256 (bzip2-1.0.8.tar.gz) = ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269
diff --git a/bzip2-32/CVE-2016-3189.patch b/bzip2-32/CVE-2016-3189.patch
deleted file mode 100644
index d947130e..00000000
--- a/bzip2-32/CVE-2016-3189.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/bzip2recover.c
-+++ b/bzip2recover.c
-@@ -457,6 +457,7 @@ Int32 main ( Int32 argc, Char** argv )
-             bsPutUChar ( bsWr, 0x50 ); bsPutUChar ( bsWr, 0x90 );
-             bsPutUInt32 ( bsWr, blockCRC );
-             bsClose ( bsWr );
-+            outFile = NULL;
-          }
-          if (wrBlock >= rbCtr) break;
-          wrBlock++;
diff --git a/bzip2-32/Pkgfile b/bzip2-32/Pkgfile
index 9e3a5e8f..cf8d9892 100644
--- a/bzip2-32/Pkgfile
+++ b/bzip2-32/Pkgfile
@@ -3,29 +3,20 @@
 # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu
 
 name=bzip2-32
-version=1.0.6
-release=2
-source=(
-	#http://www.bzip.org/$version/${name%-*}-$version.tar.gz
-	https://fossies.org/linux/misc/${name%-*}-$version.tar.gz
-	bzip2.patch
-	CVE-2016-3189.patch)
+version=1.0.8
+release=1
+source=(https://sourceware.org/pub/${name%-*}/${name%-*}-$version.tar.gz)
 
 build() {
 	cd ${name%-*}-$version
 
-	patch -p1 -i $SRC/bzip2.patch
-	patch -p1 -i $SRC/CVE-2016-3189.patch
+	install -d $PKG/usr/lib32
 
-	sed -i -e 's,$(PREFIX)/lib,$(PREFIX)/lib32,g' Makefile{,-libbz2_so}
+	make -f Makefile-libbz2_so CC="gcc $CFLAGS $LDFLAGS"
+	install -m 0644 libbz2.so.$version $PKG/usr/lib32
+	ln -s libbz2.so.$version $PKG/usr/lib32/libbz2.so
+	ln -s libbz2.so.$version $PKG/usr/lib32/libbz2.so.1.0
 
-	make
-	make PREFIX=$PKG/usr install
-
-	sed -i -e '38s,$(CC) ,$(CC) $(CFLAGS) ,' Makefile-libbz2_so
-
-	make -f Makefile-libbz2_so
-	make -f Makefile-libbz2_so PREFIX=$PKG/usr install
-
-	rm -r $PKG/usr/{bin,include,share}
+	make libbz2.a CC="gcc $CFLAGS $LDFLAGS"
+	install -m 0644 libbz2.a $PKG/usr/lib32
 }
diff --git a/bzip2-32/bzip2.patch b/bzip2-32/bzip2.patch
deleted file mode 100644
index fa0dc9d2..00000000
--- a/bzip2-32/bzip2.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-diff -aur bzip2-1.0.6.orig/Makefile bzip2-1.0.6/Makefile
---- bzip2-1.0.6.orig/Makefile	2008-02-14 13:39:18.000000000 +0100
-+++ bzip2-1.0.6/Makefile	2009-06-14 13:49:03.889599030 +0200
-@@ -21,7 +21,7 @@
- LDFLAGS=
- 
- BIGFILES=-D_FILE_OFFSET_BITS=64
--CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
-+CFLAGS+=-fpic -Wall -Winline $(BIGFILES)
- 
- # Where you want it installed when you do 'make install'
- PREFIX=/usr/local
-@@ -70,43 +70,36 @@
- 	@cat words3
- 
- install: bzip2 bzip2recover
--	if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
--	if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi
--	if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi
--	if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi
--	if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi
--	cp -f bzip2 $(PREFIX)/bin/bzip2
--	cp -f bzip2 $(PREFIX)/bin/bunzip2
--	cp -f bzip2 $(PREFIX)/bin/bzcat
--	cp -f bzip2recover $(PREFIX)/bin/bzip2recover
--	chmod a+x $(PREFIX)/bin/bzip2
--	chmod a+x $(PREFIX)/bin/bunzip2
--	chmod a+x $(PREFIX)/bin/bzcat
--	chmod a+x $(PREFIX)/bin/bzip2recover
--	cp -f bzip2.1 $(PREFIX)/man/man1
--	chmod a+r $(PREFIX)/man/man1/bzip2.1
--	cp -f bzlib.h $(PREFIX)/include
--	chmod a+r $(PREFIX)/include/bzlib.h
--	cp -f libbz2.a $(PREFIX)/lib
--	chmod a+r $(PREFIX)/lib/libbz2.a
--	cp -f bzgrep $(PREFIX)/bin/bzgrep
--	ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
--	ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
--	chmod a+x $(PREFIX)/bin/bzgrep
--	cp -f bzmore $(PREFIX)/bin/bzmore
--	ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
--	chmod a+x $(PREFIX)/bin/bzmore
--	cp -f bzdiff $(PREFIX)/bin/bzdiff
--	ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
--	chmod a+x $(PREFIX)/bin/bzdiff
--	cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1
--	chmod a+r $(PREFIX)/man/man1/bzgrep.1
--	chmod a+r $(PREFIX)/man/man1/bzmore.1
--	chmod a+r $(PREFIX)/man/man1/bzdiff.1
--	echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzegrep.1
--	echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1
--	echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1
--	echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1
-+	install -d $(PREFIX)/bin \
-+	           $(PREFIX)/lib \
-+	           $(PREFIX)/share/man/man1 \
-+	           $(PREFIX)/include
-+	install -m 755 bzip2 \
-+	               bzip2recover \
-+	               bzgrep \
-+	               bzmore \
-+	               bzdiff \
-+	               $(PREFIX)/bin
-+	install -m 644 bzlib.h $(PREFIX)/include
-+	install -m 644 libbz2.a $(PREFIX)/lib
-+	ln -sf bzip2 $(PREFIX)/bin/bunzip2
-+	ln -sf bzip2 $(PREFIX)/bin/bzcat
-+	ln -sf bzgrep $(PREFIX)/bin/bzegrep
-+	ln -sf bzgrep $(PREFIX)/bin/bzfgrep
-+	ln -sf bzmore $(PREFIX)/bin/bzless
-+	ln -sf bzdiff $(PREFIX)/bin/bzcmp
-+	install -m 644 bzip2.1 \
-+	               bzgrep.1 \
-+	               bzmore.1 \
-+	               bzdiff.1 \
-+	               $(PREFIX)/share/man/man1
-+	ln -sf bzgrep.1 $(PREFIX)/share/man/man1/bzegrep.1
-+	ln -sf bzgrep.1 $(PREFIX)/share/man/man1/bzfgrep.1
-+	ln -sf bzmore.1 $(PREFIX)/share/man/man1/bzless.1
-+	ln -sf bzdiff.1 $(PREFIX)/share/man/man1/bzcmp.1
-+	ln -sf bzip2.1 $(PREFIX)/share/man/man1/bunzip2.1
-+	ln -sf bzip2.1 $(PREFIX)/share/man/man1/bzcat.1
-+	ln -sf bzip2.1 $(PREFIX)/share/man/man1/bzip2recover.1
- 
- clean: 
- 	rm -f *.o libbz2.a bzip2 bzip2recover \
-diff -aur bzip2-1.0.6.orig/Makefile-libbz2_so bzip2-1.0.6/Makefile-libbz2_so
---- bzip2-1.0.6.orig/Makefile-libbz2_so	2007-12-09 14:00:50.000000000 +0100
-+++ bzip2-1.0.6/Makefile-libbz2_so	2009-06-14 13:48:27.519580669 +0200
-@@ -24,7 +24,7 @@
- SHELL=/bin/sh
- CC=gcc
- BIGFILES=-D_FILE_OFFSET_BITS=64
--CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
-+CFLAGS+=-fpic -Wall -Winline $(BIGFILES)
- 
- OBJS= blocksort.o  \
-       huffman.o    \
-@@ -37,11 +37,15 @@
- all: $(OBJS)
- 	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -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
-+
-+install:
-+	install -d $(PREFIX)/lib
-+	install -m 755 libbz2.so.1.0.6 $(PREFIX)/lib
-+	ln -sf libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so.1.0
-+	ln -sf libbz2.so.1.0 $(PREFIX)/lib/libbz2.so
- 
- 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 bzip2-shared
- 
- blocksort.o: blocksort.c
- 	$(CC) $(CFLAGS) -c blocksort.c
-diff -aur bzip2-1.0.6.orig/bzlib_private.h bzip2-1.0.6/bzlib_private.h
---- bzip2-1.0.6.orig/bzlib_private.h	2007-12-09 15:00:46.000000000 +0100
-+++ bzip2-1.0.6/bzlib_private.h	2009-06-14 13:53:28.200579230 +0200
-@@ -128,7 +128,7 @@
- 
- /*-- Stuff for randomising repetitive blocks. --*/
- 
--extern Int32 BZ2_rNums[512];
-+extern const Int32 BZ2_rNums[512];
- 
- #define BZ_RAND_DECLS                          \
-    Int32 rNToGo;                               \
-@@ -152,7 +152,7 @@
- 
- /*-- Stuff for doing CRCs. --*/
- 
--extern UInt32 BZ2_crc32Table[256];
-+extern const UInt32 BZ2_crc32Table[256];
- 
- #define BZ_INITIALISE_CRC(crcVar)              \
- {                                              \
-diff -aur bzip2-1.0.6.orig/crctable.c bzip2-1.0.6/crctable.c
---- bzip2-1.0.6.orig/crctable.c	2007-12-09 13:29:49.000000000 +0100
-+++ bzip2-1.0.6/crctable.c	2009-06-14 13:52:33.248830630 +0200
-@@ -28,7 +28,7 @@
-   comp.compression FAQ.
- --*/
- 
--UInt32 BZ2_crc32Table[256] = {
-+const UInt32 BZ2_crc32Table[256] = {
- 
-    /*-- Ugly, innit? --*/
- 
-diff -aur bzip2-1.0.6.orig/randtable.c bzip2-1.0.6/randtable.c
---- bzip2-1.0.6.orig/randtable.c	2007-12-09 13:32:55.000000000 +0100
-+++ bzip2-1.0.6/randtable.c	2009-06-14 13:53:38.063580427 +0200
-@@ -23,7 +23,7 @@
- 
- 
- /*---------------------------------------------*/
--Int32 BZ2_rNums[512] = { 
-+const Int32 BZ2_rNums[512] = { 
-    619, 720, 127, 481, 931, 816, 813, 233, 566, 247, 
-    985, 724, 205, 454, 863, 491, 741, 242, 949, 214, 
-    733, 859, 335, 708, 621, 574, 73, 654, 730, 472,