diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 2a4ffb892..b1e4abc28 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -107,7 +107,7 @@
 * fuse-2.7.4
 * fwhits
 * gawk-3.1.5
-* gcc-4.0.3
+* gcc-4.0.4
 * gd-2.0.33
 * gdbm-1.8.3
 * gettext-0.14.5
diff --git a/lfs/gcc b/lfs/gcc
index 2e8f2725c..1f9021c05 100644
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.0.3
+VER        = 4.0.4
 
 THISAPP    = gcc-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -118,7 +118,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 6ff1af12c53cbb3f79b27f2d6a9a3d50
+$(DL_FILE)_MD5 = 8970debbc55bea85ee80961d733080f0
 
 install : $(TARGET)
 
@@ -148,7 +148,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) $(DIR_SRC)/gcc-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc-pr28045.patch
+#	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc-pr28045.patch
 	@mkdir $(DIR_SRC)/gcc-build
 ifeq "$(ROOT)" ""
 ifeq "$(INST)" "1"
diff --git a/lfs/pcmciautils b/lfs/pcmciautils
index 7feaefe1d..67ad5601f 100644
--- a/lfs/pcmciautils
+++ b/lfs/pcmciautils
@@ -84,7 +84,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 
 ifeq "$(LFS_PASS)" "install"
-	ln -f -s ../../../../../include/sysfs /opt/$(MACHINE)-uClibc/lib/gcc/$(MACHINE)-linux-uclibc/4.0.3/include/sysfs
+	ln -f -s ../../../../../include/sysfs /opt/$(MACHINE)-uClibc/lib/gcc/$(MACHINE)-linux-uclibc/4.0.4/include/sysfs
 	cd $(DIR_APP) && make
 	cd $(DIR_APP) && install -m 755 pccardctl /install/initrd/sbin/
 	ln -f -s pccardctl /install/initrd/sbin/lspcmcia