diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 0d4b3a472..a455cda93 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,6 +42,17 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
 -->
+    <listitem>
+      <para>2017-02-25</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Comment out the test-lock test in coreutils,
+          findutils, gettext because on some machines it now loops
+          forever.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2017-02-19</para>
       <itemizedlist>
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index 00874e4fa..fdd097998 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -53,6 +53,13 @@
       without this patch.</para>
     </note>
 
+   <!-- this has been fixed in upstream gnulib, when a new version of
+   coreutils is released, please check #4055 to see if the change has been
+   picked up in this package -->
+   <para>Suppress a test which on some machines can loop forever.</para>
+
+<screen><userinput remap="pre">sed -i '/test.lock/s/^/#/' gnulib-tests/gnulib.mk</userinput></screen>
+
     <para>Now prepare Coreutils for compilation:</para>
 
 <screen><userinput remap="configure">FORCE_UNSAFE_CONFIGURE=1 ./configure \
diff --git a/chapter06/findutils.xml b/chapter06/findutils.xml
index 8eb46d515..a13fec4eb 100644
--- a/chapter06/findutils.xml
+++ b/chapter06/findutils.xml
@@ -43,6 +43,13 @@
   <sect2 role="installation">
     <title>Installation of Findutils</title>
 
+   <!-- this has been fixed in upstream gnulib, when a new version of
+   findutils is released, please check #4055 to see if the change has been
+   picked up in this package -->
+   <para>Suppress a test which on some machines can loop forever.</para>
+
+<screen><userinput remap="pre">sed -i 's/test-lock..EXEEXT.//' gettext-tools/gnulib-tests/Makefile.in</userinput></screen>
+
     <para>Prepare Findutils for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr --localstatedir=/var/lib/locate</userinput></screen>
diff --git a/chapter06/gettext.xml b/chapter06/gettext.xml
index dc198b748..ef8cd2633 100644
--- a/chapter06/gettext.xml
+++ b/chapter06/gettext.xml
@@ -43,6 +43,15 @@
   <sect2 role="installation">
     <title>Installation of Gettext</title>
 
+   <!-- this has been fixed in upstream gnulib, when a new version of
+   gettext is released, please check #4055 to see if the change has been
+   picked up in this package -->
+   <para>Suppress two invocations of test-lock which on some machines
+   can loop forever.</para>
+
+<screen><userinput remap="pre">sed -i '/^TESTS =/d' gettext-runtime/tests/Makefile.in &amp;&amp;
+sed -i 's/test-lock..EXEEXT.//' gettext-tools/gnulib-tests/Makefile.in</userinput></screen>
+
     <para>Prepare Gettext for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr    \
diff --git a/general.ent b/general.ent
index b06bf0b53..c3562038f 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20170219">
+<!ENTITY version         "SVN-20170225">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20170219-systemd">
+<!ENTITY versiond        "20170225-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "February 19, 2017">
+<!ENTITY releasedate     "February 25, 2017">
 <!ENTITY copyrightdate   "1999-2017"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "8.0">