Index: BOOK/cross-tools/64/binutils.xml
===================================================================
--- BOOK/cross-tools/64/binutils.xml	(revision 831133963d9b75d6d334fde438a072b56a16bf3a)
+++ BOOK/cross-tools/64/binutils.xml	(revision e15ed01d9d97db0f0c0eab62e8319de0f1d37a9f)
@@ -52,5 +52,6 @@
     --prefix=/cross-tools --host=${CLFS_HOST} --target=${CLFS_TARGET} \
     --with-sysroot=${CLFS} --with-lib-path=/tools/lib --disable-nls \
-    --disable-static --enable-64-bit-bfd --disable-multilib --disable-werror</userinput></screen>
+    --disable-static --enable-64-bit-bfd --disable-multilib
+    --enable-gold=yes --enable-plugins --enable-threads --disable-werror</userinput></screen>
 
     <variablelist os="bd">
Index: BOOK/cross-tools/common/binutils.xml
===================================================================
--- BOOK/cross-tools/common/binutils.xml	(revision 831133963d9b75d6d334fde438a072b56a16bf3a)
+++ BOOK/cross-tools/common/binutils.xml	(revision e15ed01d9d97db0f0c0eab62e8319de0f1d37a9f)
@@ -52,5 +52,6 @@
     --prefix=/cross-tools --host=${CLFS_HOST} --target=${CLFS_TARGET} \
     --with-sysroot=${CLFS} --with-lib-path=/tools/lib --disable-nls \
-    --disable-static --disable-multilib --disable-werror</userinput></screen>
+    --disable-static --disable-multilib --enable-gold=yes --enable-plugins \
+    --enable-threads--disable-werror</userinput></screen>
 
     <variablelist os="bd">
Index: BOOK/cross-tools/common/gmp.xml
===================================================================
--- BOOK/cross-tools/common/gmp.xml	(revision 831133963d9b75d6d334fde438a072b56a16bf3a)
+++ BOOK/cross-tools/common/gmp.xml	(revision e15ed01d9d97db0f0c0eab62e8319de0f1d37a9f)
@@ -36,11 +36,4 @@
     into <filename class="directory">/cross-tools</filename> because GCC
     requires them to build.</para>
-
-    <note os="n1">
-      <para>If you are building with a host which has 32-bit user-space with a
-      64-bit capable CPU, cross-tools GMP will attempt to link with 64-bit
-      libraries. Add the following variable during <command>configure</command>
-      to force GMP's ABI: <command>./configure ABI=32</command></para>
-    </note>
 
     <para os="a">Prepare GMP for compilation:</para>
Index: BOOK/cross-tools/common/ncurses.xml
===================================================================
--- BOOK/cross-tools/common/ncurses.xml	(revision 831133963d9b75d6d334fde438a072b56a16bf3a)
+++ BOOK/cross-tools/common/ncurses.xml	(revision e15ed01d9d97db0f0c0eab62e8319de0f1d37a9f)
@@ -43,5 +43,5 @@
     <para os="a">Prepare Ncurses for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/cross-tools \
+<screen os="b"><userinput>AWK=gawk ./configure --prefix=/cross-tools \
     --without-debug</userinput></screen>
 
Index: BOOK/cross-tools/multilib/binutils.xml
===================================================================
--- BOOK/cross-tools/multilib/binutils.xml	(revision 831133963d9b75d6d334fde438a072b56a16bf3a)
+++ BOOK/cross-tools/multilib/binutils.xml	(revision e15ed01d9d97db0f0c0eab62e8319de0f1d37a9f)
@@ -51,5 +51,6 @@
     --prefix=/cross-tools --host=${CLFS_HOST} --target=${CLFS_TARGET} \
     --with-sysroot=${CLFS} --with-lib-path=/tools/lib:/tools/lib64 \
-    --disable-nls --disable-static --enable-64-bit-bfd --disable-werror</userinput></screen>
+    --disable-nls --disable-static --enable-64-bit-bfd --enable-gold=yes \
+    --enable-plugins --enable-threads--disable-werror</userinput></screen>
 
     <variablelist os="bd">
Index: BOOK/final-system/64/binutils.xml
===================================================================
--- BOOK/final-system/64/binutils.xml	(revision 831133963d9b75d6d334fde438a072b56a16bf3a)
+++ BOOK/final-system/64/binutils.xml	(revision e15ed01d9d97db0f0c0eab62e8319de0f1d37a9f)
@@ -67,5 +67,6 @@
   ../binutils-&binutils-dir;/configure --prefix=/usr \
     --libdir=/usr/lib --enable-shared \
-    --disable-multilib --enable-64-bit-bfd</userinput></screen>
+    --disable-multilib --enable-64-bit-bfd \
+    --enable-gold=yes --enable-plugins --enable-threads</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/common/binutils.xml
===================================================================
--- BOOK/final-system/common/binutils.xml	(revision 831133963d9b75d6d334fde438a072b56a16bf3a)
+++ BOOK/final-system/common/binutils.xml	(revision e15ed01d9d97db0f0c0eab62e8319de0f1d37a9f)
@@ -58,5 +58,5 @@
 LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
   ../binutils-&binutils-dir;/configure --prefix=/usr \
-    --enable-shared</userinput></screen>
+    --enable-shared --enable-gold=yes --enable-plugins --enable-threads</userinput></screen>
 
     <para os="j">Compile the package:</para>
Index: BOOK/final-system/mips64/binutils.xml
===================================================================
--- BOOK/final-system/mips64/binutils.xml	(revision 831133963d9b75d6d334fde438a072b56a16bf3a)
+++ BOOK/final-system/mips64/binutils.xml	(revision e15ed01d9d97db0f0c0eab62e8319de0f1d37a9f)
@@ -66,5 +66,6 @@
 LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64:/usr/lib32:/lib32:/usr/lib:/lib ${BUILD64}" \
   ../binutils-&binutils-dir;/configure --prefix=/usr \
-    --enable-shared --enable-64-bit-bfd --libdir=/usr/lib64</userinput></screen>
+    --enable-shared --enable-64-bit-bfd --libdir=/usr/lib64 \
+    --enable-gold=yes --enable-plugins --enable-threads</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/binutils.xml
===================================================================
--- BOOK/final-system/multilib/binutils.xml	(revision 831133963d9b75d6d334fde438a072b56a16bf3a)
+++ BOOK/final-system/multilib/binutils.xml	(revision e15ed01d9d97db0f0c0eab62e8319de0f1d37a9f)
@@ -66,5 +66,6 @@
 LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64:/usr/lib:/lib ${BUILD64}" \
   ../binutils-&binutils-dir;/configure --prefix=/usr \
-    --enable-shared --enable-64-bit-bfd --libdir=/usr/lib64</userinput></screen>
+    --enable-shared --enable-64-bit-bfd --libdir=/usr/lib64 \
+    --enable-gold=yes --enable-plugins --enable-threads</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 831133963d9b75d6d334fde438a072b56a16bf3a)
+++ BOOK/introduction/common/changelog.xml	(revision e15ed01d9d97db0f0c0eab62e8319de0f1d37a9f)
@@ -41,4 +41,8 @@
       <itemizedlist>
         <listitem>
+          <para>[William Harrington] - Update Binutils to 2.25.1. Fixes ticket
+          <ulink url="&clfs-ticket-root;1023">#1023.</ulink></para>
+        </listitem>
+        <listitem>
           <para>[William Harrington] - Update XZ to 5.2.2. Fixes ticket
           <ulink url="&clfs-ticket-root;1081">#1081.</ulink></para>
Index: BOOK/packages.ent
===================================================================
--- BOOK/packages.ent	(revision 831133963d9b75d6d334fde438a072b56a16bf3a)
+++ BOOK/packages.ent	(revision e15ed01d9d97db0f0c0eab62e8319de0f1d37a9f)
@@ -37,9 +37,9 @@
 <!ENTITY bc-home "&gnu-software;bc/">
 
-<!ENTITY binutils-version "2.24">
+<!ENTITY binutils-version "2.25.1">
 <!ENTITY binutils-dir "&binutils-version;">
-<!ENTITY binutils-size "22,717 KB">
+<!ENTITY binutils-size "24,164 KB">
 <!ENTITY binutils-url "&gnu;binutils/binutils-&binutils-version;.tar.bz2">
-<!ENTITY binutils-md5 "e0f71a7b2ddab0f8612336ac81d9636b">
+<!ENTITY binutils-md5 "ac493a78de4fee895961d025b7905be4">
 <!ENTITY binutils-home "http://sources.redhat.com/binutils">
 
Index: BOOK/temp-system/64/binutils.xml
===================================================================
--- BOOK/temp-system/64/binutils.xml	(revision 831133963d9b75d6d334fde438a072b56a16bf3a)
+++ BOOK/temp-system/64/binutils.xml	(revision e15ed01d9d97db0f0c0eab62e8319de0f1d37a9f)
@@ -47,5 +47,6 @@
     --prefix=/tools --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --target=${CLFS_TARGET} --with-lib-path=/tools/lib --disable-nls \
-    --enable-shared --enable-64-bit-bfd --disable-multilib</userinput></screen>
+    --enable-shared --enable-64-bit-bfd --disable-multilib \
+    --enable-gold=yes --enable-plugins --enable-threads</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/common/binutils.xml
===================================================================
--- BOOK/temp-system/common/binutils.xml	(revision 831133963d9b75d6d334fde438a072b56a16bf3a)
+++ BOOK/temp-system/common/binutils.xml	(revision e15ed01d9d97db0f0c0eab62e8319de0f1d37a9f)
@@ -48,5 +48,5 @@
     --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
     --with-lib-path=/tools/lib --disable-nls --enable-shared \
-    --disable-multilib</userinput></screen>
+    --disable-multilib --enable-gold=yes --enable-plugins --enable-threads</userinput></screen>
 
     <variablelist os="k">
Index: BOOK/temp-system/multilib/binutils.xml
===================================================================
--- BOOK/temp-system/multilib/binutils.xml	(revision 831133963d9b75d6d334fde438a072b56a16bf3a)
+++ BOOK/temp-system/multilib/binutils.xml	(revision e15ed01d9d97db0f0c0eab62e8319de0f1d37a9f)
@@ -47,5 +47,6 @@
     --prefix=/tools --libdir=/tools/lib64 --with-lib-path=/tools/lib64:/tools/lib \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
-    --disable-nls --enable-shared --enable-64-bit-bfd</userinput></screen>
+    --disable-nls --enable-shared --enable-64-bit-bfd \
+    --enable-gold=yes --enable-plugins --enable-threads</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
