Index: BOOK/final-system/mips/mktemp.xml
===================================================================
--- BOOK/final-system/mips/mktemp.xml	(revision ce8626b2193023dd5dc890fc899c9cda287b43d1)
+++ BOOK/final-system/mips/mktemp.xml	(revision 0c037b3ea18a8238b6855622301706fb22043dc0)
@@ -30,8 +30,9 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-    <para os="p1">This patch updates <filename>config.guess</filename> and
-    <filename>config.sub</filename> for MIPS processors.</para>
+    <para os="p1">The configure files in this package do not recognise all
+    of the machines supported by CLFS. This patch updates <filename>config.guess</filename>
+    and <filename>config.sub</filename> for other processors.</para>
 
-<screen os="p2"><userinput>patch -Np1 -i ../&mktemp-mips_update-patch;</userinput></screen>
+<screen os="p2"><userinput>patch -Np1 -i ../&mktemp-update-patch;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/ppc64/mktemp.xml
===================================================================
--- BOOK/final-system/ppc64/mktemp.xml	(revision ce8626b2193023dd5dc890fc899c9cda287b43d1)
+++ BOOK/final-system/ppc64/mktemp.xml	(revision 0c037b3ea18a8238b6855622301706fb22043dc0)
@@ -30,9 +30,11 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-    <para>This is an old package, and its config scripts do not recognise
-    powerpc64.  We have already installed suitably recent scripts, so we can
-    use those to assist.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/mktemp.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
 
-<screen><userinput>cp -v /usr/share/&automake-directory;/config.{guess,sub} .</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/mktemp.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/general.ent
===================================================================
--- BOOK/general.ent	(revision ce8626b2193023dd5dc890fc899c9cda287b43d1)
+++ BOOK/general.ent	(revision 0c037b3ea18a8238b6855622301706fb22043dc0)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!ENTITY version "SVN-20060614">
+<!ENTITY version "SVN-20060618">
 <!ENTITY version-x86 "&version;-x86">
 <!ENTITY version-x86_64 "&version;-x86_64-Multilib">
@@ -16,5 +16,5 @@
 <!ENTITY version-alpha "&version;-ALPHA">
 
-<!ENTITY releasedate "June 14, 2006">
+<!ENTITY releasedate "June 18, 2006">
 <!ENTITY milestone "0.1">
 <!ENTITY generic-version "svn"> <!-- Use "svn", "testing", or "x.y[-pre{x}]" -->
Index: BOOK/introduction/ppc64/changelog.xml
===================================================================
--- BOOK/introduction/ppc64/changelog.xml	(revision ce8626b2193023dd5dc890fc899c9cda287b43d1)
+++ BOOK/introduction/ppc64/changelog.xml	(revision 0c037b3ea18a8238b6855622301706fb22043dc0)
@@ -35,4 +35,14 @@
 
     <listitem>
+      <para>June 18, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Use the mktemp_configure patch, originally from mips,
+	  instead of updating config.{guess,sub} from installed versions.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>June 8, 2006</para>
       <itemizedlist>
Index: BOOK/materials/mips/patches.xml
===================================================================
--- BOOK/materials/mips/patches.xml	(revision ce8626b2193023dd5dc890fc899c9cda287b43d1)
+++ BOOK/materials/mips/patches.xml	(revision 0c037b3ea18a8238b6855622301706fb22043dc0)
@@ -71,10 +71,10 @@
     </varlistentry>
 
-    <varlistentry os="mktemp-mips_update-patch">
-      <term>Mktemp Config Update Patch - <token>&mktemp-mips_update-patch-size;</token>:</term>
+    <varlistentry os="mktemp-update-patch">
+      <term>Mktemp Config Update Patch - <token>&mktemp-update-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
-        url="&patches-root;mktemp/&mktemp-mips_update-patch;"/></para>
-        <para>MD5 sum: <literal>&mktemp-mips_update-patch-md5;</literal></para>
+        url="&patches-root;mktemp/&mktemp-update-patch;"/></para>
+        <para>MD5 sum: <literal>&mktemp-update-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
Index: BOOK/materials/mips64-64/patches.xml
===================================================================
--- BOOK/materials/mips64-64/patches.xml	(revision ce8626b2193023dd5dc890fc899c9cda287b43d1)
+++ BOOK/materials/mips64-64/patches.xml	(revision 0c037b3ea18a8238b6855622301706fb22043dc0)
@@ -51,5 +51,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='mktemp-mips_update-patch'])"/>
+    xpointer="xpointer(//*[@os='mktemp-update-patch'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/materials/mips64/patches.xml
===================================================================
--- BOOK/materials/mips64/patches.xml	(revision ce8626b2193023dd5dc890fc899c9cda287b43d1)
+++ BOOK/materials/mips64/patches.xml	(revision 0c037b3ea18a8238b6855622301706fb22043dc0)
@@ -55,5 +55,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='mktemp-mips_update-patch'])"/>
+    xpointer="xpointer(//*[@os='mktemp-update-patch'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/materials/ppc64/patches.xml
===================================================================
--- BOOK/materials/ppc64/patches.xml	(revision ce8626b2193023dd5dc890fc899c9cda287b43d1)
+++ BOOK/materials/ppc64/patches.xml	(revision 0c037b3ea18a8238b6855622301706fb22043dc0)
@@ -30,4 +30,13 @@
     xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
 
+    <varlistentry os="mktemp-update-patch">
+      <term>Mktemp Config Update Patch - <token>&mktemp-update-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink
+        url="&patches-root;mktemp/&mktemp-update-patch;"/></para>
+        <para>MD5 sum: <literal>&mktemp-update-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
       <term>Powerpc-utils_(&powerpcutils-version;) Fixes Patch - <token>&powerpcutils64-patch-size;</token>:</term>
Index: BOOK/patches.ent
===================================================================
--- BOOK/patches.ent	(revision ce8626b2193023dd5dc890fc899c9cda287b43d1)
+++ BOOK/patches.ent	(revision 0c037b3ea18a8238b6855622301706fb22043dc0)
@@ -189,7 +189,8 @@
 <!ENTITY linux-mips-patch-size "864 KB">
 
-<!ENTITY mktemp-mips_update-patch "mktemp-&mktemp-version;-mips_config_update-1.patch">
-<!ENTITY mktemp-mips_update-patch-md5 "2eab6432dbf4d4447b85435363c6a557">
-<!ENTITY mktemp-mips_update-patch-size "56 KB">
+<!-- this is also used for ppc64 -->
+<!ENTITY mktemp-update-patch "mktemp-&mktemp-version;-config_update-1.patch">
+<!ENTITY mktemp-update-patch-md5 "2eab6432dbf4d4447b85435363c6a557">
+<!ENTITY mktemp-update-patch-size "56 KB">
 
 <!ENTITY module-init-tools-mips_update-patch "module-init-tools-&module-init-tools-version;-mips_config_update-1.patch">
