diff --git a/archiver/bzip2/bzip2.conf b/archiver/bzip2/bzip2.conf
index 036cc1096..2d5ca9df7 100644
--- a/archiver/bzip2/bzip2.conf
+++ b/archiver/bzip2/bzip2.conf
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # 
 # Filename: package/.../bzip2/bzip2.conf
-# Copyright (C) 2006 The OpenSDE Project
+# Copyright (C) 2006 - 2007 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # Copyright (C) 1998 - 2003 Clifford Wolf
 # 
@@ -15,7 +15,7 @@
 # --- SDE-COPYRIGHT-NOTE-END ---
 
 # apply the patches defined in the package description
-var_append patchfiles ' ' "`match_source_file -p 'patch'`"
+#var_append patchfiles ' ' "`match_source_file -p 'patch'`"
 
 var_append makeopt ' ' "AR=$AR RANLIB=$RANLIB"
 var_append makeinstopt ' ' "PREFIX=$root USRPREFIX=$root/usr"
diff --git a/archiver/bzip2/bzip2.desc b/archiver/bzip2/bzip2.desc
index e9a52103d..675fb79e4 100644
--- a/archiver/bzip2/bzip2.desc
+++ b/archiver/bzip2/bzip2.desc
@@ -3,7 +3,7 @@
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY] 
 [COPY] Filename: package/.../bzip2/bzip2.desc
-[COPY] Copyright (C) 2006 The OpenSDE Project
+[COPY] Copyright (C) 2006 - 2007 The OpenSDE Project
 [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
 [COPY] Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
@@ -33,11 +33,9 @@
 
 [L] OpenSource
 [S] Stable
-[V] 1.0.3
+[V] 1.0.4
 [P] X -1---5---9 108.600
 
 [CV-URL] http://www.bzip.org/downloads.html
 
-[D] 2351367897 bzip2-1.0.3.tar.gz http://www.bzip.org/1.0.3/
-
-[D] 3026285618 bzip2-1.0.3-bzgrep_security-1.patch http://www.linuxfromscratch.org/patches/downloads/bzip2/
+[D] 2881675732 bzip2-1.0.4.tar.gz http://www.bzip.org/1.0.4/
diff --git a/archiver/bzip2/fix_shared.patch b/archiver/bzip2/fix_shared.patch
index cbd1b3daf..f69a4a040 100644
--- a/archiver/bzip2/fix_shared.patch
+++ b/archiver/bzip2/fix_shared.patch
@@ -1,8 +1,8 @@
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # 
-# T2 SDE: package/.../bzip2/fix_shared.patch
-# Copyright (C) 2006 The T2 SDE Project
+# Filename: package/.../bzip2/fix_shared.patch
+# Copyright (C) 2007 The OpenSDE Project
 # 
 # More information can be found in the files COPYING and README.
 # 
@@ -12,16 +12,16 @@
 # 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.
-# --- T2-COPYRIGHT-NOTE-END ---
+# --- SDE-COPYRIGHT-NOTE-END ---
 
---- bzip2-1.0.3/Makefile-libbz2_so.orig	2006-01-03 14:42:47.000000000 -0300
-+++ bzip2-1.0.3/Makefile-libbz2_so	2006-01-03 14:43:11.000000000 -0300
-@@ -21,7 +21,7 @@
+--- bzip2-1.0.4/Makefile-libbz2_so.orig	2007-03-11 22:45:54.000000000 +0200
++++ bzip2-1.0.4/Makefile-libbz2_so	2007-03-11 22:54:52.318387250 +0200
+@@ -36,7 +36,7 @@
  
  all: $(OBJS)
- 	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.3 $(OBJS)
--	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.3
-+	$(CC) $(CFLAGS) -shared -o bzip2-shared bzip2.c libbz2.so.1.0.3
+ 	$(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
++	$(CC) $(CFLAGS) -shared -o bzip2-shared bzip2.c libbz2.so.1.0.4
  	rm -f libbz2.so.1.0
- 	ln -s libbz2.so.1.0.3 libbz2.so.1.0
+ 	ln -s libbz2.so.1.0.4 libbz2.so.1.0
  
diff --git a/archiver/bzip2/makefile.patch b/archiver/bzip2/makefile.patch
index 861ed0a69..939e6cd92 100644
--- a/archiver/bzip2/makefile.patch
+++ b/archiver/bzip2/makefile.patch
@@ -1,9 +1,8 @@
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # 
-# T2 SDE: package/.../bzip2/makefile.patch
-# Copyright (C) 2004 - 2006 The T2 SDE Project
-# Copyright (C) 1998 - 2003 Clifford Wolf
+# Filename: package/.../bzip2/makefile.patch
+# Copyright (C) 2007 The OpenSDE Project
 # 
 # More information can be found in the files COPYING and README.
 # 
@@ -13,22 +12,22 @@
 # 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.
-# --- T2-COPYRIGHT-NOTE-END ---
+# --- SDE-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)
+--- bzip2-1.0.4/Makefile.orig	2007-01-03 05:49:21.000000000 +0200
++++ bzip2-1.0.4/Makefile	2007-03-11 23:30:56.781657750 +0200
+@@ -24,8 +24,8 @@
+ CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
  
  # Where you want it installed when you do 'make install'
--PREFIX=/usr
+-PREFIX=/usr/local
 -
 +PREFIX=/
 +USRPREFIX=/usr
  
  OBJS= blocksort.o  \
        huffman.o    \
-@@ -23,7 +23,7 @@
+@@ -35,7 +35,7 @@
        decompress.o \
        bzlib.o
  
@@ -37,7 +36,7 @@
  
  bzip2: libbz2.a bzip2.o
  	$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2
-@@ -34,11 +34,7 @@
+@@ -46,12 +46,7 @@
  libbz2.a: $(OBJS)
  	rm -f libbz2.a
  	$(AR) cq libbz2.a $(OBJS)
@@ -46,11 +45,12 @@
 -		echo $(RANLIB) libbz2.a ; \
 -		$(RANLIB) libbz2.a ; \
 -	fi
+-
 +	$(RANLIB) libbz2.a
- 
  check: test
  test: bzip2
-@@ -59,42 +55,42 @@
+ 	@cat words1
+@@ -71,42 +66,42 @@
  
  install: bzip2 bzip2recover
  	if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
@@ -78,14 +78,14 @@
 -	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
+-	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 $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
+-	ln -s -f $(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
+-	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
@@ -103,14 +103,14 @@
 +	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
++	ln -s -f $(USRPREFIX)/bin/bzgrep $(USRPREFIX)/bin/bzegrep
++	ln -s -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
++	ln -s -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
++	ln -s -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
@@ -121,5 +121,5 @@
 +	echo ".so man1/bzmore.1" > $(USRPREFIX)/man/man1/bzless.1
 +	echo ".so man1/bzdiff.1" > $(USRPREFIX)/man/man1/bzcmp.1
  
- distclean: clean
  clean: 
+ 	rm -f *.o libbz2.a bzip2 bzip2recover \