diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 1b9fa7e59..d9d468398 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -61,6 +61,10 @@
+September 29th, 2002 [timothy]: Chapter 05 - GCC: Replaced
+the nofixincludes patch (because it doesn't apply cleanly) with a sed
+command.
+
September 28th, 2002 [gerard]: Chapter 05 - GCC: Added the
nofixincludes patch to prevent that script from running in Chapter
05. It should run in Chapter 06, so we need it to be a seperate
diff --git a/chapter04/gcc-patch.xml b/chapter04/gcc-patch.xml
index b1b7d2779..f93b6248e 100644
--- a/chapter04/gcc-patch.xml
+++ b/chapter04/gcc-patch.xml
@@ -1,7 +1,3 @@
GCC Patch (&gcc-patch-version;) - &gcc-patch-size;:
-
-GCC nofixincludes Patch:
-
-
diff --git a/chapter05/gcc-exp.xml b/chapter05/gcc-exp.xml
index c64f22f6c..ae6d923ac 100644
--- a/chapter05/gcc-exp.xml
+++ b/chapter05/gcc-exp.xml
@@ -6,8 +6,8 @@ This patch fixes a few bugs. In particular it contains the "copy fix" and
"var fix" documented at
.
-patch -Np1 -i ../gcc-&gcc-version;-nofixincludes.patch:
-This patch prevents the fixincludes script from running.
+sed '/$(SHELL) .\/fixinc.sh/d':
+This prevents the fixincludes script from running.
--prefix=/static: This is NOT a typo. GCC hard
codes some paths while compiling and so we need to pass /static as the
diff --git a/chapter05/gcc-inst.xml b/chapter05/gcc-inst.xml
index 36662b95d..b09ee4cdb 100644
--- a/chapter05/gcc-inst.xml
+++ b/chapter05/gcc-inst.xml
@@ -15,7 +15,8 @@ been warned.
Install GCC by running the following commands:
patch -Np1 -i ../gcc-&gcc-patch-version;.patch &&
-patch -Np1 -i ../gcc-&gcc-version;-nofixincludes.patch &&
+cp gcc/Makefile.in{,.backup} &&
+sed '/$(SHELL) .\/fixinc.sh/d' gcc/Makefile.in.backup > gcc/Makefile.in &&
mkdir ../gcc-build &&
cd ../gcc-build &&
../gcc-&gcc-version;/configure --prefix=/static --enable-languages=c \