Index: BOOK/appendices/dependencies/common.xml
===================================================================
--- BOOK/appendices/dependencies/common.xml	(revision 6be82d86cea23da791e2bf4b475e9bd4fe842390)
+++ BOOK/appendices/dependencies/common.xml	(revision cb56f0d97f1f4d154d04b718f23873d5a8481f72)
@@ -1039,5 +1039,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC and Make</seg>
+         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Libcap and Make</seg>
         </seglistitem>
       </segmentedlist>
Index: BOOK/final-system/alpha-chapter.xml
===================================================================
--- BOOK/final-system/alpha-chapter.xml	(revision 6be82d86cea23da791e2bf4b475e9bd4fe842390)
+++ BOOK/final-system/alpha-chapter.xml	(revision cb56f0d97f1f4d154d04b718f23873d5a8481f72)
@@ -61,7 +61,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
Index: BOOK/final-system/common/iputils.xml
===================================================================
--- BOOK/final-system/common/iputils.xml	(revision 6be82d86cea23da791e2bf4b475e9bd4fe842390)
+++ BOOK/final-system/common/iputils.xml	(revision cb56f0d97f1f4d154d04b718f23873d5a8481f72)
@@ -32,5 +32,5 @@
     <para os="a">Compile the package:</para>
 
-<screen os="b"><userinput>make USE_CAP=no \
+<screen os="b"><userinput>make \
     IPV4_TARGETS="tracepath ping clockdiff rdisc" \
     IPV6_TARGETS="tracepath6 traceroute6"</userinput></screen>
Index: BOOK/final-system/mips-chapter.xml
===================================================================
--- BOOK/final-system/mips-chapter.xml	(revision 6be82d86cea23da791e2bf4b475e9bd4fe842390)
+++ BOOK/final-system/mips-chapter.xml	(revision cb56f0d97f1f4d154d04b718f23873d5a8481f72)
@@ -61,7 +61,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
Index: BOOK/final-system/mips64-64-chapter.xml
===================================================================
--- BOOK/final-system/mips64-64-chapter.xml	(revision 6be82d86cea23da791e2bf4b475e9bd4fe842390)
+++ BOOK/final-system/mips64-64-chapter.xml	(revision cb56f0d97f1f4d154d04b718f23873d5a8481f72)
@@ -61,7 +61,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
Index: BOOK/final-system/mips64-chapter.xml
===================================================================
--- BOOK/final-system/mips64-chapter.xml	(revision 6be82d86cea23da791e2bf4b475e9bd4fe842390)
+++ BOOK/final-system/mips64-chapter.xml	(revision cb56f0d97f1f4d154d04b718f23873d5a8481f72)
@@ -102,9 +102,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iputils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-n32.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iputils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
Index: BOOK/final-system/multilib/iputils.xml
===================================================================
--- BOOK/final-system/multilib/iputils.xml	(revision 6be82d86cea23da791e2bf4b475e9bd4fe842390)
+++ BOOK/final-system/multilib/iputils.xml	(revision cb56f0d97f1f4d154d04b718f23873d5a8481f72)
@@ -34,5 +34,5 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>make USE_CAP=no CC="gcc ${BUILD64}" \
+<screen os="b"><userinput>make CC="gcc ${BUILD64}" \
     IPV4_TARGETS="tracepath ping clockdiff rdisc" \
     IPV6_TARGETS="tracepath6 traceroute6"</userinput></screen>
Index: BOOK/final-system/ppc-chapter.xml
===================================================================
--- BOOK/final-system/ppc-chapter.xml	(revision 6be82d86cea23da791e2bf4b475e9bd4fe842390)
+++ BOOK/final-system/ppc-chapter.xml	(revision cb56f0d97f1f4d154d04b718f23873d5a8481f72)
@@ -61,7 +61,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
Index: BOOK/final-system/ppc64-64-chapter.xml
===================================================================
--- BOOK/final-system/ppc64-64-chapter.xml	(revision 6be82d86cea23da791e2bf4b475e9bd4fe842390)
+++ BOOK/final-system/ppc64-64-chapter.xml	(revision cb56f0d97f1f4d154d04b718f23873d5a8481f72)
@@ -61,4 +61,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
Index: BOOK/final-system/ppc64-chapter.xml
===================================================================
--- BOOK/final-system/ppc64-chapter.xml	(revision 6be82d86cea23da791e2bf4b475e9bd4fe842390)
+++ BOOK/final-system/ppc64-chapter.xml	(revision cb56f0d97f1f4d154d04b718f23873d5a8481f72)
@@ -82,8 +82,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
Index: BOOK/final-system/sparc-chapter.xml
===================================================================
--- BOOK/final-system/sparc-chapter.xml	(revision 6be82d86cea23da791e2bf4b475e9bd4fe842390)
+++ BOOK/final-system/sparc-chapter.xml	(revision cb56f0d97f1f4d154d04b718f23873d5a8481f72)
@@ -61,7 +61,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
Index: BOOK/final-system/sparc64-64-chapter.xml
===================================================================
--- BOOK/final-system/sparc64-64-chapter.xml	(revision 6be82d86cea23da791e2bf4b475e9bd4fe842390)
+++ BOOK/final-system/sparc64-64-chapter.xml	(revision cb56f0d97f1f4d154d04b718f23873d5a8481f72)
@@ -61,7 +61,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
Index: BOOK/final-system/sparc64-chapter.xml
===================================================================
--- BOOK/final-system/sparc64-chapter.xml	(revision 6be82d86cea23da791e2bf4b475e9bd4fe842390)
+++ BOOK/final-system/sparc64-chapter.xml	(revision cb56f0d97f1f4d154d04b718f23873d5a8481f72)
@@ -82,8 +82,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
Index: BOOK/final-system/x86-chapter.xml
===================================================================
--- BOOK/final-system/x86-chapter.xml	(revision 6be82d86cea23da791e2bf4b475e9bd4fe842390)
+++ BOOK/final-system/x86-chapter.xml	(revision cb56f0d97f1f4d154d04b718f23873d5a8481f72)
@@ -61,7 +61,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
Index: BOOK/final-system/x86_64-64-chapter.xml
===================================================================
--- BOOK/final-system/x86_64-64-chapter.xml	(revision 6be82d86cea23da791e2bf4b475e9bd4fe842390)
+++ BOOK/final-system/x86_64-64-chapter.xml	(revision cb56f0d97f1f4d154d04b718f23873d5a8481f72)
@@ -61,7 +61,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
Index: BOOK/final-system/x86_64-chapter.xml
===================================================================
--- BOOK/final-system/x86_64-chapter.xml	(revision 6be82d86cea23da791e2bf4b475e9bd4fe842390)
+++ BOOK/final-system/x86_64-chapter.xml	(revision cb56f0d97f1f4d154d04b718f23873d5a8481f72)
@@ -82,8 +82,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 6be82d86cea23da791e2bf4b475e9bd4fe842390)
+++ BOOK/introduction/common/changelog.xml	(revision cb56f0d97f1f4d154d04b718f23873d5a8481f72)
@@ -38,4 +38,14 @@
 
     <listitem>
+      <para>09 January 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Moved libcap so it's built just before iputils,
+          which can use libcap.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>08 January 2014</para>
       <itemizedlist>
