diff --git a/chapter05/gettext-inst.xml b/chapter05/gettext-inst.xml
index c1dd70ace..660a77486 100644
--- a/chapter05/gettext-inst.xml
+++ b/chapter05/gettext-inst.xml
@@ -3,8 +3,8 @@
Installation of Gettext
-CFLAGS="-O2 -pipe" ./configure --prefix=/stage1 &&
-make LDFLAGS="-s" &&
+CFLAGS="-O2 -pipe" ./configure --prefix=/stage1 &&
+make LDFLAGS="-s" &&
make check
make install
diff --git a/chapter05/lockingglibc.xml b/chapter05/lockingglibc.xml
index 9b0658aff..dd9c61e2c 100644
--- a/chapter05/lockingglibc.xml
+++ b/chapter05/lockingglibc.xml
@@ -11,10 +11,10 @@
You can remove the binutils-* directories now.
-SPECFILE=/stage1/lib/gcc-lib/i686-pc-linux-gnu/*/specs &&
-cp ${SPECFILE} ./XX &&
-sed 's@/lib/ld-linux.so.2@/stage1/lib/ld-linux.so.2@g' ./XX > ${SPECFILE} &&
-unset SPECFILE &&
+SPECFILE=/stage1/lib/gcc-lib/i686-pc-linux-gnu/*/specs &&
+cp ${SPECFILE} ./XX &&
+sed 's@/lib/ld-linux.so.2@/stage1/lib/ld-linux.so.2@g' ./XX > ${SPECFILE} &&
+unset SPECFILE &&
rm -f ./XX
diff --git a/chapter05/ncurses-inst.xml b/chapter05/ncurses-inst.xml
index 5409398ae..2fcb18e7f 100644
--- a/chapter05/ncurses-inst.xml
+++ b/chapter05/ncurses-inst.xml
@@ -5,10 +5,10 @@
patch -Np1 -i ../ncurses-&ncurses-version;-etip-2.patch
patch -Np1 -i ../ncurses-&ncurses-version;-vsscanf.patch
-./configure --prefix=/stage1 --with-shared --without-debug --without-ada &&
-make &&
+./configure --prefix=/stage1 --with-shared --without-debug --without-ada &&
+make &&
make install
-chmod 755 /stage1/lib/*.5.3 &&
+chmod 755 /stage1/lib/*.5.3 &&
ln -s libncurses.a /stage1/lib/libcurses.a
ln -sf /stage1/lib/libncurses.so.5 /stage1/lib/libcurses.so
diff --git a/chapter05/perl-inst.xml b/chapter05/perl-inst.xml
index a64f7019f..f44cdfde1 100644
--- a/chapter05/perl-inst.xml
+++ b/chapter05/perl-inst.xml
@@ -3,12 +3,12 @@
Installation of Perl
patch -Np1 -i ../perl-&perl-version;-libc.patch
-./configure.gnu --prefix=/stage1 -Doptimize='-O2 -pipe' &&
+./configure.gnu --prefix=/stage1 -Doptimize='-O2 -pipe' &&
make perl
-make utilities &&
-cp perl /stage1/bin/perl &&
-cp pod/pod2man /stage1/bin &&
-mkdir -p /stage1/lib/perl5/5.8.0 &&
+make utilities &&
+cp perl /stage1/bin/perl &&
+cp pod/pod2man /stage1/bin &&
+mkdir -p /stage1/lib/perl5/5.8.0 &&
cp -R lib/* /stage1/lib/perl5/5.8.0
diff --git a/chapter06/adjustingtoolchain.xml b/chapter06/adjustingtoolchain.xml
index c269e57ff..941b79bf5 100644
--- a/chapter06/adjustingtoolchain.xml
+++ b/chapter06/adjustingtoolchain.xml
@@ -4,10 +4,10 @@
cd binutils-build
make -C ld INSTALL=/stage1/bin/install install-data-local
-SPECFILE=/stage1/lib/gcc-lib/i686-pc-linux-gnu/*/specs &&
-cp ${SPECFILE} ./XX &&
-sed 's@/stage1/lib/ld-linux.so.2@/lib/ld-linux.so.2@g' ./XX > ${SPECFILE} &&
-unset SPECFILE &&
+SPECFILE=/stage1/lib/gcc-lib/i686-pc-linux-gnu/*/specs &&
+cp ${SPECFILE} ./XX &&
+sed 's@/stage1/lib/ld-linux.so.2@/lib/ld-linux.so.2@g' ./XX > ${SPECFILE} &&
+unset SPECFILE &&
rm -f ./XX
diff --git a/chapter06/coreutils-inst.xml b/chapter06/coreutils-inst.xml
index 17db7671e..d57a9b490 100644
--- a/chapter06/coreutils-inst.xml
+++ b/chapter06/coreutils-inst.xml
@@ -6,10 +6,10 @@
./configure --prefix=/usr
make
make install
-mv /usr/bin/{basename,cat,chgrp,chmod,chown,cp,dd,df} /bin &&
-mv /usr/bin/{dir,dircolors,du,date,echo,false,head} /bin &&
-mv /usr/bin/{install,ln,ls,mkdir,mkfifo,mknod,mv,pwd} /bin &&
-mv /usr/bin/{rm,rmdir,shred,sync,sleep,stty,su,test} /bin &&
+mv /usr/bin/{basename,cat,chgrp,chmod,chown,cp,dd,df} /bin &&
+mv /usr/bin/{dir,dircolors,du,date,echo,false,head} /bin &&
+mv /usr/bin/{install,ln,ls,mkdir,mkfifo,mknod,mv,pwd} /bin &&
+mv /usr/bin/{rm,rmdir,shred,sync,sleep,stty,su,test} /bin &&
mv /usr/bin/{touch,true,uname,vdir} /bin
mv /usr/bin/chroot /usr/sbin
ln -s test /bin/[
diff --git a/index.xml b/index.xml
index 5b9addd32..fa9cd39a2 100644
--- a/index.xml
+++ b/index.xml
@@ -6,6 +6,7 @@
+