diff --git a/index.xml b/index.xml
index 3ce856179..97ddbeeff 100644
--- a/index.xml
+++ b/index.xml
@@ -4,8 +4,8 @@
 
 <!ENTITY book SYSTEM "intel/book/book.xml">
 
-<!ENTITY version "3.0-cvs-20010422">
-<!ENTITY releasedate "April 22nd, 2001">
+<!ENTITY version "3.0-cvs-20010428">
+<!ENTITY releasedate "April 28th, 2001">
 <!ENTITY type "INTEL">
 
 <!ENTITY ftp-root "ftp://packages.linuxfromscratch.org">
@@ -137,47 +137,47 @@
 <!ENTITY chapter5 SYSTEM "intel/chapter5/chapter5.xml">
 <!ENTITY c5-introduction SYSTEM "intel/chapter5/introduction.xml">
 <!ENTITY c5-installasroot SYSTEM "intel/chapter5/installasroot.xml">
-<!ENTITY c5-bash SYSTEM "intel/chapter5/bash-static.xml">
-<!ENTITY c5-bash-inst SYSTEM "intel/chapter5/bash-static-inst.xml">
-<!ENTITY c5-bash-exp SYSTEM "intel/chapter5/bash-static-exp.xml">
-<!ENTITY c5-binutils SYSTEM "intel/chapter5/binutils-static.xml">
-<!ENTITY c5-binutils-inst SYSTEM "intel/chapter5/binutils-static-inst.xml">
-<!ENTITY c5-binutils-exp SYSTEM "intel/chapter5/binutils-static-exp.xml">
-<!ENTITY c5-bzip2 SYSTEM "intel/chapter5/bzip2-static.xml">
-<!ENTITY c5-bzip2-inst SYSTEM "intel/chapter5/bzip2-static-inst.xml">
-<!ENTITY c5-bzip2-exp SYSTEM "intel/chapter5/bzip2-static-exp.xml">
-<!ENTITY c5-diffutils SYSTEM "intel/chapter5/diffutils-static.xml">
-<!ENTITY c5-diffutils-inst SYSTEM "intel/chapter5/diffutils-static-inst.xml">
-<!ENTITY c5-diffutils-exp SYSTEM "intel/chapter5/diffutils-static-exp.xml">
-<!ENTITY c5-fileutils SYSTEM "intel/chapter5/fileutils-static.xml">
-<!ENTITY c5-fileutils-inst SYSTEM "intel/chapter5/fileutils-static-inst.xml">
-<!ENTITY c5-fileutils-exp SYSTEM "intel/chapter5/fileutils-static-exp.xml">
-<!ENTITY c5-gcc SYSTEM "intel/chapter5/gcc-static.xml">
-<!ENTITY c5-gcc-inst SYSTEM "intel/chapter5/gcc-static-inst.xml">
-<!ENTITY c5-gcc-exp SYSTEM "intel/chapter5/gcc-static-exp.xml">
+<!ENTITY c5-bash SYSTEM "intel/chapter5/bash.xml">
+<!ENTITY c5-bash-inst SYSTEM "intel/chapter5/bash-inst.xml">
+<!ENTITY c5-bash-exp SYSTEM "intel/chapter5/bash-exp.xml">
+<!ENTITY c5-binutils SYSTEM "intel/chapter5/binutils.xml">
+<!ENTITY c5-binutils-inst SYSTEM "intel/chapter5/binutils-inst.xml">
+<!ENTITY c5-binutils-exp SYSTEM "intel/chapter5/binutils-exp.xml">
+<!ENTITY c5-bzip2 SYSTEM "intel/chapter5/bzip2.xml">
+<!ENTITY c5-bzip2-inst SYSTEM "intel/chapter5/bzip2-inst.xml">
+<!ENTITY c5-bzip2-exp SYSTEM "intel/chapter5/bzip2-exp.xml">
+<!ENTITY c5-diffutils SYSTEM "intel/chapter5/diffutils.xml">
+<!ENTITY c5-diffutils-inst SYSTEM "intel/chapter5/diffutils-inst.xml">
+<!ENTITY c5-diffutils-exp SYSTEM "intel/chapter5/diffutils-exp.xml">
+<!ENTITY c5-fileutils SYSTEM "intel/chapter5/fileutils.xml">
+<!ENTITY c5-fileutils-inst SYSTEM "intel/chapter5/fileutils-inst.xml">
+<!ENTITY c5-fileutils-exp SYSTEM "intel/chapter5/fileutils-exp.xml">
+<!ENTITY c5-gcc SYSTEM "intel/chapter5/gcc.xml">
+<!ENTITY c5-gcc-inst SYSTEM "intel/chapter5/gcc-inst.xml">
+<!ENTITY c5-gcc-exp SYSTEM "intel/chapter5/gcc-exp.xml">
 <!ENTITY c5-kernel SYSTEM "intel/chapter5/kernel.xml">
 <!ENTITY c5-kernel-inst SYSTEM "intel/chapter5/kernel-inst.xml">
 <!ENTITY c5-kernel-exp SYSTEM "intel/chapter5/kernel-exp.xml">
-<!ENTITY c5-grep SYSTEM "intel/chapter5/grep-static.xml">
-<!ENTITY c5-grep-inst SYSTEM "intel/chapter5/grep-static-inst.xml">
-<!ENTITY c5-gzip SYSTEM "intel/chapter5/gzip-static.xml">
-<!ENTITY c5-gzip-inst SYSTEM "intel/chapter5/gzip-static-inst.xml">
-<!ENTITY c5-make SYSTEM "intel/chapter5/make-static.xml">
-<!ENTITY c5-make-inst SYSTEM "intel/chapter5/make-static-inst.xml">
-<!ENTITY c5-sed SYSTEM "intel/chapter5/sed-static.xml">
-<!ENTITY c5-sed-inst SYSTEM "intel/chapter5/sed-static-inst.xml">
-<!ENTITY c5-shellutils SYSTEM "intel/chapter5/shellutils-static.xml">
-<!ENTITY c5-shellutils-inst SYSTEM "intel/chapter5/shellutils-static-inst.xml">
-<!ENTITY c5-tar SYSTEM "intel/chapter5/tar-static.xml">
-<!ENTITY c5-tar-inst SYSTEM "intel/chapter5/tar-static-inst.xml">
-<!ENTITY c5-textutils SYSTEM "intel/chapter5/textutils-static.xml">
-<!ENTITY c5-textutils-inst SYSTEM "intel/chapter5/textutils-static-inst.xml">
-<!ENTITY c5-mawk SYSTEM "intel/chapter5/mawk-static.xml">
-<!ENTITY c5-mawk-inst SYSTEM "intel/chapter5/mawk-static-inst.xml">
-<!ENTITY c5-texinfo SYSTEM "intel/chapter5/texinfo-static.xml">
-<!ENTITY c5-texinfo-inst SYSTEM "intel/chapter5/texinfo-static-inst.xml">
-<!ENTITY c5-gettext SYSTEM "intel/chapter5/gettext-static.xml">
-<!ENTITY c5-gettext-inst SYSTEM "intel/chapter5/gettext-static-inst.xml">
+<!ENTITY c5-grep SYSTEM "intel/chapter5/grep.xml">
+<!ENTITY c5-grep-inst SYSTEM "intel/chapter5/grep-inst.xml">
+<!ENTITY c5-gzip SYSTEM "intel/chapter5/gzip.xml">
+<!ENTITY c5-gzip-inst SYSTEM "intel/chapter5/gzip-inst.xml">
+<!ENTITY c5-make SYSTEM "intel/chapter5/make.xml">
+<!ENTITY c5-make-inst SYSTEM "intel/chapter5/make-inst.xml">
+<!ENTITY c5-sed SYSTEM "intel/chapter5/sed.xml">
+<!ENTITY c5-sed-inst SYSTEM "intel/chapter5/sed-inst.xml">
+<!ENTITY c5-shellutils SYSTEM "intel/chapter5/shellutils.xml">
+<!ENTITY c5-shellutils-inst SYSTEM "intel/chapter5/shellutils-inst.xml">
+<!ENTITY c5-tar SYSTEM "intel/chapter5/tar.xml">
+<!ENTITY c5-tar-inst SYSTEM "intel/chapter5/tar-inst.xml">
+<!ENTITY c5-textutils SYSTEM "intel/chapter5/textutils.xml">
+<!ENTITY c5-textutils-inst SYSTEM "intel/chapter5/textutils-inst.xml">
+<!ENTITY c5-mawk SYSTEM "intel/chapter5/mawk.xml">
+<!ENTITY c5-mawk-inst SYSTEM "intel/chapter5/mawk-inst.xml">
+<!ENTITY c5-texinfo SYSTEM "intel/chapter5/texinfo.xml">
+<!ENTITY c5-texinfo-inst SYSTEM "intel/chapter5/texinfo-inst.xml">
+<!ENTITY c5-gettext SYSTEM "intel/chapter5/gettext.xml">
+<!ENTITY c5-gettext-inst SYSTEM "intel/chapter5/gettext-inst.xml">
 <!ENTITY c5-pwdgroup SYSTEM "intel/chapter5/pwdgroup.xml">
 <!ENTITY c5-oldnsslib SYSTEM "intel/chapter5/oldnsslib.xml">
 <!ENTITY c5-proc SYSTEM "intel/chapter5/proc.xml">