Index: chapter01/changelog.xml
===================================================================
--- chapter01/changelog.xml	(revision ee46f608efb806aacaba0da665a10a34f09ec64f)
+++ chapter01/changelog.xml	(revision b75237d5e36b8c40d191dc1832789401968b274e)
@@ -38,4 +38,17 @@
 
     <listitem>
+      <para>2016-01-24</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Update to coreutils-8.25 - Merged from trunk.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Simplify bash installation procedures - Merged from
+          trunk.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2016-01-17</para>
       <itemizedlist>
@@ -68,5 +81,5 @@
 
     <listitem>
-      <para>2016-01-01</para>
+      <para>2016-01-17</para>
       <itemizedlist>
         <listitem>
Index: chapter01/whatsnew.xml
===================================================================
--- chapter01/whatsnew.xml	(revision ee46f608efb806aacaba0da665a10a34f09ec64f)
+++ chapter01/whatsnew.xml	(revision b75237d5e36b8c40d191dc1832789401968b274e)
@@ -53,7 +53,7 @@
       <para>Check &check-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Coreutils &coreutils-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>D-Bus-&dbus-version;</para>
Index: chapter06/bash.xml
===================================================================
--- chapter06/bash.xml	(revision ee46f608efb806aacaba0da665a10a34f09ec64f)
+++ chapter06/bash.xml	(revision b75237d5e36b8c40d191dc1832789401968b274e)
@@ -49,5 +49,4 @@
 
 <screen><userinput remap="configure">./configure --prefix=/usr                       \
-            --bindir=/bin                       \
             --docdir=/usr/share/doc/bash-&bash-version; \
             --without-bash-malloc               \
@@ -85,7 +84,9 @@
 <screen><userinput remap="test">su nobody -s /bin/bash -c "PATH=$PATH make tests"</userinput></screen>
 
-    <para>Install the package:</para>
+    <para>Install the package and move the main executable to
+    <filename class='directory'>/bin</filename>:</para>
 
-<screen><userinput remap="install">make install</userinput></screen>
+<screen><userinput remap="install">make install
+mv -vf /usr/bin/bash /bin</userinput></screen>
 
     <para>Run the newly compiled <command>bash</command> program (replacing the one that is
Index: chapter06/coreutils.xml
===================================================================
--- chapter06/coreutils.xml	(revision ee46f608efb806aacaba0da665a10a34f09ec64f)
+++ chapter06/coreutils.xml	(revision b75237d5e36b8c40d191dc1832789401968b274e)
@@ -49,14 +49,7 @@
     <para>POSIX requires that programs from Coreutils recognize character
     boundaries correctly even in multibyte locales. The following patch fixes
-    this non-compliance and other internationalization-related bugs.
-    <!--Afterwards make sure the timestamp for <filename>Makefile.in</filename> is
-    later than all other files to prevent a <command>make</command>
-    error:</para>-->
-    Afterwards disable a test that fails with the current version of perl.</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&coreutils-i18n-patch; 
-sed -i '/tests\/misc\/sort.pl/ d' Makefile.in</userinput></screen>
-
-<!--touch Makefile.in</userinput></screen>-->
+    this non-compliance and other internationalization-related bugs.</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&coreutils-i18n-patch;</userinput></screen>
 
     <note>
@@ -96,5 +89,5 @@
     <para>Compile the package:</para>
 
-<screen><userinput remap="make">make</userinput></screen>
+<screen><userinput remap="make">FORCE_UNSAFE_CONFIGURE=1 make</userinput></screen>
 
     <para>Skip down to <quote>Install the
Index: packages.ent
===================================================================
--- packages.ent	(revision ee46f608efb806aacaba0da665a10a34f09ec64f)
+++ packages.ent	(revision b75237d5e36b8c40d191dc1832789401968b274e)
@@ -96,8 +96,8 @@
 <!ENTITY check-ch5-sbu "0.1 SBU">
 
-<!ENTITY coreutils-version "8.24">
-<!ENTITY coreutils-size "5,518 KB">
+<!ENTITY coreutils-version "8.25">
+<!ENTITY coreutils-size "5,591 KB">
 <!ENTITY coreutils-url "&gnu;coreutils/coreutils-&coreutils-version;.tar.xz">
-<!ENTITY coreutils-md5 "40efdbce865d2458d8da0a9dcee7c16c">
+<!ENTITY coreutils-md5 "070e43ba7f618d747414ef56ab248a48">
 <!ENTITY coreutils-home "&gnu-software;coreutils/">
 <!ENTITY coreutils-ch5-du "133 MB">
Index: patches.ent
===================================================================
--- patches.ent	(revision ee46f608efb806aacaba0da665a10a34f09ec64f)
+++ patches.ent	(revision b75237d5e36b8c40d191dc1832789401968b274e)
@@ -16,6 +16,6 @@
 
 <!ENTITY coreutils-i18n-patch "coreutils-&coreutils-version;-i18n-1.patch">
-<!ENTITY coreutils-i18n-patch-md5 "c6a5ccda1ca61de7c93b09d27a9a26d5">
-<!ENTITY coreutils-i18n-patch-size "141 KB">
+<!ENTITY coreutils-i18n-patch-md5 "7f871078956b20d4745fc197eb6ad3c5">
+<!ENTITY coreutils-i18n-patch-size "172 KB">
 
 <!ENTITY glibc-fhs-patch "glibc-&glibc-version;-fhs-1.patch">
