diff --git a/package/base/bzip2/bzip2.conf b/package/base/bzip2/bzip2.conf
index ab6685ee1..d6567f300 100644
--- a/package/base/bzip2/bzip2.conf
+++ b/package/base/bzip2/bzip2.conf
@@ -1,3 +1,4 @@
+#!/bin/bash
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
@@ -20,11 +21,21 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-MAKE="$MAKE PREFIX=$root USRPREFIX=$root/usr"
-makeinstopt="$makeinstopt INSTROOT=$root"
-inmake="cp -v manual* bzip2.txt $docdir; \
-	if [ "$ROCKCFG_DIETLIBC_bzip2" -ne 1 ]; then \
+# var_append makeopt " " "PREFIX=$root"
+var_append makeinstopt " " "PREFIX=$root/usr"
+
+inmake="cp Makefile{,.orig}; \
+	sed -e '/^all:/s/ test//' Makefile.orig > Makefile; \
+	cp -v manual* bzip2.txt $docdir; \
+	if [ \"$ROCKCFG_DIETLIBC_bzip2\" != 1 ]; then \
 		$MAKE -f Makefile-libbz2_so; \
-		ln -svf libbz2.so.1.0 libbz2.so.1; \
-		cp -a libbz2.so.* $root/usr/lib; \
 	fi"
+
+postmake="if [ \"$ROCKCFG_DIETLIBC_bzip2\" != 1 ]; then \
+		ln -svf libbz2.so.1.0 libbz2.so.1; \
+		cp -a libbz2.so.* $root/lib; \
+		cp -v bzip2-shared $root/bin/bzip2; \
+	fi; \
+	rm -vf $root/usr/bin/{bunzip2,bzcat,bzip2}; \
+	ln -sfv bzip2 $root/bin/bunzip2; \
+	ln -sfv bzip2 $root/bin/bzcat"
diff --git a/package/base/bzip2/makefile.patch b/package/base/bzip2/makefile.patch
deleted file mode 100644
index d9159e3ea..000000000
--- a/package/base/bzip2/makefile.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/base/bzip2/makefile.patch
-# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
---- ./Makefile.orig	Sat Jan 26 00:34:53 2002
-+++ ./Makefile	Wed Apr  3 01:35:16 2002
-@@ -12,8 +12,8 @@
- CFLAGS=-Wall -Winline -O2 -fomit-frame-pointer -fno-strength-reduce $(BIGFILES)
- 
- # Where you want it installed when you do 'make install'
--PREFIX=/usr
--
-+PREFIX=/
-+USRPREFIX=/usr
- 
- OBJS= blocksort.o  \
-       huffman.o    \
-@@ -23,7 +23,7 @@
-       decompress.o \
-       bzlib.o
- 
--all: libbz2.a bzip2 bzip2recover test
-+all: libbz2.a bzip2 bzip2recover
- 
- bzip2: libbz2.a bzip2.o
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2
-@@ -34,11 +34,7 @@
- libbz2.a: $(OBJS)
- 	rm -f libbz2.a
- 	$(AR) cq libbz2.a $(OBJS)
--	@if ( test -f $(RANLIB) -o -f /usr/bin/ranlib -o \
--		-f /bin/ranlib -o -f /usr/ccs/bin/ranlib ) ; then \
--		echo $(RANLIB) libbz2.a ; \
--		$(RANLIB) libbz2.a ; \
--	fi
-+	$(RANLIB) libbz2.a
- 
- check: test
- test: bzip2
-@@ -59,42 +55,42 @@
- 
- 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
-+	if ( test ! -d $(USRPREFIX)/lib ) ; then mkdir -p $(USRPREFIX)/lib ; fi
-+	if ( test ! -d $(USRPREFIX)/man ) ; then mkdir -p $(USRPREFIX)/man ; fi
-+	if ( test ! -d $(USRPREFIX)/man/man1 ) ; then mkdir -p $(USRPREFIX)/man/man1 ; fi
-+	if ( test ! -d $(USRPREFIX)/include ) ; then mkdir -p $(USRPREFIX)/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
-+	cp -f bzip2recover $(USRPREFIX)/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 $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
--	ln $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
--	chmod a+x $(PREFIX)/bin/bzgrep
--	cp -f bzmore $(PREFIX)/bin/bzmore
--	ln $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
--	chmod a+x $(PREFIX)/bin/bzmore
--	cp -f bzdiff $(PREFIX)/bin/bzdiff
--	ln $(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
-+	chmod a+x $(USRPREFIX)/bin/bzip2recover
-+	cp -f bzip2.1 $(USRPREFIX)/man/man1
-+	chmod a+r $(USRPREFIX)/man/man1/bzip2.1
-+	cp -f bzlib.h $(USRPREFIX)/include
-+	chmod a+r $(USRPREFIX)/include/bzlib.h
-+	cp -f libbz2.a $(USRPREFIX)/lib
-+	chmod a+r $(USRPREFIX)/lib/libbz2.a
-+	cp -f bzgrep $(USRPREFIX)/bin/bzgrep
-+	ln -f $(USRPREFIX)/bin/bzgrep $(USRPREFIX)/bin/bzegrep
-+	ln -f $(USRPREFIX)/bin/bzgrep $(USRPREFIX)/bin/bzfgrep
-+	chmod a+x $(USRPREFIX)/bin/bzgrep
-+	cp -f bzmore $(USRPREFIX)/bin/bzmore
-+	ln -f $(USRPREFIX)/bin/bzmore $(USRPREFIX)/bin/bzless
-+	chmod a+x $(USRPREFIX)/bin/bzmore
-+	cp -f bzdiff $(USRPREFIX)/bin/bzdiff
-+	ln -f $(USRPREFIX)/bin/bzdiff $(USRPREFIX)/bin/bzcmp
-+	chmod a+x $(USRPREFIX)/bin/bzdiff
-+	cp -f bzgrep.1 bzmore.1 bzdiff.1 $(USRPREFIX)/man/man1
-+	chmod a+r $(USRPREFIX)/man/man1/bzgrep.1
-+	chmod a+r $(USRPREFIX)/man/man1/bzmore.1
-+	chmod a+r $(USRPREFIX)/man/man1/bzdiff.1
-+	echo ".so man1/bzgrep.1" > $(USRPREFIX)/man/man1/bzegrep.1
-+	echo ".so man1/bzgrep.1" > $(USRPREFIX)/man/man1/bzfgrep.1
-+	echo ".so man1/bzmore.1" > $(USRPREFIX)/man/man1/bzless.1
-+	echo ".so man1/bzdiff.1" > $(USRPREFIX)/man/man1/bzcmp.1
- 
- distclean: clean
- clean: