Index: BOOK/boot/ppc/powerpc-utils.xml
===================================================================
--- BOOK/boot/ppc/powerpc-utils.xml	(revision 8ac4555227870ea8c199877f6936fb85d7129215)
+++ BOOK/boot/ppc/powerpc-utils.xml	(revision 9aaf578d10269de993b4913193c5713acfc3951d)
@@ -31,12 +31,12 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-    <para os="a">This package's Makefile has issues with cross-compiling. Fortunately,
+    <para os="c">This package's Makefile has issues with cross-compiling. Fortunately,
     we only need one program and it is a simple task to compile it.</para>
 
-<screen><userinput>${CC} -o nvsetenv nvsetenv.c nwnvsetenv.c</userinput></screen>
+<screen os="d"><userinput>${CC} -o nvsetenv nvsetenv.c nwnvsetenv.c</userinput></screen>
 
-    <para os="c">Install the program:</para>
+    <para os="e">Install the program:</para>
 
-<screen os="d"><userinput>install -v -m755 nvsetenv /tools/sbin</userinput></screen>
+<screen os="f"><userinput>install -v -m755 nvsetenv /tools/sbin</userinput></screen>
 
   </sect2>
Index: BOOK/boot/ppc64-64/powerpc-utils.xml
===================================================================
--- BOOK/boot/ppc64-64/powerpc-utils.xml	(revision 8ac4555227870ea8c199877f6936fb85d7129215)
+++ BOOK/boot/ppc64-64/powerpc-utils.xml	(revision 9aaf578d10269de993b4913193c5713acfc3951d)
@@ -24,18 +24,10 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/powerpc-utils.xml"
+    href="../ppc/powerpc-utils.xml"
     xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr \
-  --exec-prefix="" --sysconfdir=/etc \
-  --sbindir=/sbin --libexecdir=/lib/udev \
-  --libdir=/usr/lib --with-systemdsystemunitdir=/lib/systemd/system \
-  --disable-extras --disable-introspection</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../ppc/powerpc-utils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>${CC} ${BUILD64} -o nvsetenv nvsetenv.c nwnvsetenv.c</userinput></screen>
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -43,7 +35,13 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
+<screen os="d"><userinput>${CC} ${BUILD64} -o nvsetenv nvsetenv.c nwnvsetenv.c</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../ppc/powerpc-utils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../ppc/powerpc-utils.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
   </sect2>
Index: BOOK/boot/ppc64/powerpc-utils.xml
===================================================================
--- BOOK/boot/ppc64/powerpc-utils.xml	(revision 8ac4555227870ea8c199877f6936fb85d7129215)
+++ BOOK/boot/ppc64/powerpc-utils.xml	(revision 9aaf578d10269de993b4913193c5713acfc3951d)
@@ -24,16 +24,10 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/powerpc-utils.xml"
+    href="../ppc/powerpc-utils.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/powerpc-utils.xml"
+    href="../ppc/powerpc-utils.xml"
     xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/powerpc-utils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>${CC} ${BUILD32} -o nvsetenv nvsetenv.c nwnvsetenv.c</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -41,7 +35,13 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
+<screen os="d"><userinput>${CC} ${BUILD32} -o nvsetenv nvsetenv.c nwnvsetenv.c</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../ppc/powerpc-utils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../ppc/powerpc-utils.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
   </sect2>
