Index: BOOK/beyond-clfs3/common/dropbear.xml
===================================================================
--- BOOK/beyond-clfs3/common/dropbear.xml	(revision 59565166bdd9f2fc7604d75ea867a39dbeeab075)
+++ BOOK/beyond-clfs3/common/dropbear.xml	(revision 3c65c9983f4e27a58dce0ab9775715957922f7d3)
@@ -31,9 +31,9 @@
     <para os="p1">Dropbear doesn't accept our ${CLFS_TARGET} by default, so a patch is needed to make it recognise it:</para>
 
-    <screen os="p2"><userinput>patch -Np1 -i ../dropbear-&dropbear-version;-autotools-1.patch</userinput></screen>
+    <screen os="p2"><userinput>patch -Np1 -i ../&dropbear-autotool-patch;</userinput></screen>
 
     <para os="p3">Dropbear incorrectly calls ld instead of gcc for linking, so fix it:</para>
 
-    <screen os="p4"><userinput>cp Makefile.in Makefile.in.orig
+    <screen os="p4"><userinput>cp Makefile.in{,.orig}
 sed -e s/@LD@/@CC@/ Makefile.in.orig > Makefile.in</userinput></screen>
 
Index: BOOK/beyond-clfs3/common/iptables.xml
===================================================================
--- BOOK/beyond-clfs3/common/iptables.xml	(revision 59565166bdd9f2fc7604d75ea867a39dbeeab075)
+++ BOOK/beyond-clfs3/common/iptables.xml	(revision 3c65c9983f4e27a58dce0ab9775715957922f7d3)
@@ -26,12 +26,16 @@
     <title>Installation of iptables</title>
 
+   <para os="p1">Fixes Compile Issue with DO_MULTI=1:</para>
+
+    <screen os="p2"><userinput>patch -Np1 -i ../&iptables-domulti-patch;</userinput></screen>
+
     <para os="a">Compile the package:</para>
 
-<screen os="b"><userinput>make CC="${CC} ${BUILD}" COPT_FLAGS="-Os" LD=${LD} DO_MULTI=0 PREFIX=/usr \
+<screen os="b"><userinput>make CC="${CC} ${BUILD}" COPT_FLAGS="-Os" LD=${LD} DO_MULTI=1 PREFIX=/usr \
     KERNEL_DIR=${CLFS}/lib/modules/&linux-version;/build LIBDIR=/lib BINDIR=/sbin</userinput></screen>
 
     <para os="c">Install the package:</para>
 
-<screen os="d"><userinput>make DO_MULTI=0 PREFIX=/usr \
+<screen os="d"><userinput>make DO_MULTI=1 PREFIX=/usr \
    LIBDIR=/lib BINDIR=/sbin install DESTDIR=${CLFS}</userinput></screen>
 
Index: BOOK/beyond-clfs3/common/patches.xml
===================================================================
--- BOOK/beyond-clfs3/common/patches.xml	(revision 59565166bdd9f2fc7604d75ea867a39dbeeab075)
+++ BOOK/beyond-clfs3/common/patches.xml	(revision 3c65c9983f4e27a58dce0ab9775715957922f7d3)
@@ -27,4 +27,12 @@
     </varlistentry>
 
+    <varlistentry>
+      <term>IPTables DO_MULTI Patch - <token>&iptables-domulti-patch-size;</token>:</term> <listitem>
+        <para>Download: <ulink
+        url="&patches-root;&iptables-domulti-patch;"/></para>
+        <para>MD5 sum: <literal>&iptables-domulti-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
   </variablelist>
 
Index: BOOK/final-system/x86/busybox.xml
===================================================================
--- BOOK/final-system/x86/busybox.xml	(revision 59565166bdd9f2fc7604d75ea867a39dbeeab075)
+++ BOOK/final-system/x86/busybox.xml	(revision 3c65c9983f4e27a58dce0ab9775715957922f7d3)
@@ -34,5 +34,5 @@
     <ulink url="http://busybox.net/downloads/fixes-&busybox-version;"/></para>
 
-    <para os="p2"Here's an example of how to apply the patches from Busybox's website
+    <para os="p2">Here's an example of how to apply the patches from Busybox's website
     replace {patch_name} with the name of the patch:</para>
 
Index: BOOK/patches.ent
===================================================================
--- BOOK/patches.ent	(revision 59565166bdd9f2fc7604d75ea867a39dbeeab075)
+++ BOOK/patches.ent	(revision 3c65c9983f4e27a58dce0ab9775715957922f7d3)
@@ -43,4 +43,8 @@
 <!ENTITY dropbear-autotool-patch-size "56 KB">
 
+<!ENTITY iptables-domulti-patch "iptables-&iptables-version;-do_multi-1.patch">
+<!ENTITY iptables-domulti-patch-md5 "b0c73cb8ae3a7e767b6ae9eedce09436">
+<!ENTITY iptables-domulti-patch-size "4 KB">
+
 <!-- MIPS Patches -->
 
Index: patches/iptables-1.3.7-do_multi-1.patch
===================================================================
--- patches/iptables-1.3.7-do_multi-1.patch	(revision 3c65c9983f4e27a58dce0ab9775715957922f7d3)
+++ patches/iptables-1.3.7-do_multi-1.patch	(revision 3c65c9983f4e27a58dce0ab9775715957922f7d3)
@@ -0,0 +1,67 @@
+Submitted By: Jim Gifford <jciccone@linuxfromscratch.org>
+Date: 2007-02-04
+Initial Package Version: 1.3.7
+Origin: http://lists.netfilter.org/pipermail/netfilter-devel/2006-December/026344.html
+Upstream Status: Already Applied
+Description: Fixes Build Issues with DO_MULTI=1
+
+diff -Naur iptables-1.3.7.orig/iptables-multi.c iptables-1.3.7/iptables-multi.c
+--- iptables-1.3.7.orig/iptables-multi.c	2006-12-04 03:15:20.000000000 -0800
++++ iptables-1.3.7/iptables-multi.c	2007-02-04 20:57:32.000000000 -0800
+@@ -6,6 +6,7 @@
+ int iptables_main(int argc, char **argv);
+ int iptables_save_main(int argc, char **argv);
+ int iptables_restore_main(int argc, char **argv);
++int iptables_xml_main(int argc, char **argv);
+ 
+ int main(int argc, char **argv) {
+   char *progname;
+@@ -24,6 +25,8 @@
+     
+     if (!strcmp(progname, "iptables-restore"))
+       return iptables_restore_main(argc, argv);
++    if (!strcmp(progname, "iptables-xml"))
++      return iptables_restore_main(argc, argv);
+     
+     fprintf(stderr, "iptables multi-purpose version: unknown applet name %s\n", progname);
+     exit(1);
+diff -Naur iptables-1.3.7.orig/iptables-xml.c iptables-1.3.7/iptables-xml.c
+--- iptables-1.3.7.orig/iptables-xml.c	2006-12-04 03:15:20.000000000 -0800
++++ iptables-1.3.7/iptables-xml.c	2007-02-04 20:57:32.000000000 -0800
+@@ -26,8 +26,9 @@
+ /* no need to link with iptables.o */
+ const char *program_name;
+ const char *program_version;
+-int line = 0;
+ 
++#ifndef IPTABLES_MULTI
++int line = 0;
+ void
+ exit_error(enum exittype status, char *msg, ...)
+ {
+@@ -41,6 +42,7 @@
+ 	/* On error paths, make sure that we don't leak memory */
+ 	exit(status);
+ }
++#endif
+ 
+ static void print_usage(const char *name, const char *version)
+ 	    __attribute__ ((noreturn));
+@@ -66,7 +68,7 @@
+ 	exit(1);
+ }
+ 
+-int
++static int
+ parse_counters(char *string, struct ipt_counters *ctr)
+ {
+ 	if (string != NULL)
+@@ -605,7 +607,7 @@
+ 
+ #ifdef IPTABLES_MULTI
+ int
+-iptables_restore_main(int argc, char *argv[])
++iptables_xml_main(int argc, char *argv[])
+ #else
+ int
+ main(int argc, char *argv[])
