diff --git a/general/genlib/npth.xml b/general/genlib/npth.xml
index 0558fadf75..cc0675e730 100644
--- a/general/genlib/npth.xml
+++ b/general/genlib/npth.xml
@@ -6,8 +6,8 @@
 
   <!ENTITY npth-download-http " ">
   <!ENTITY npth-download-ftp  "ftp://ftp.gnupg.org/gcrypt/npth/npth-&npth-version;.tar.bz2">
-  <!ENTITY npth-md5sum        "efe1524c53670b5755dc27893d2d68a0">
-  <!ENTITY npth-size          "292 KB">
+  <!ENTITY npth-md5sum        "76cef5542e0db6a339cf960641ed86f8">
+  <!ENTITY npth-size          "296 KB">
   <!ENTITY npth-buildsize     "2.5 MB (with checks)">
   <!ENTITY npth-time          "less than 0.1 SBU (with checks)">
 ]>
diff --git a/general/sysutils/udisks2.xml b/general/sysutils/udisks2.xml
index 863a3df0a0..90954190c5 100644
--- a/general/sysutils/udisks2.xml
+++ b/general/sysutils/udisks2.xml
@@ -4,11 +4,11 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY udisks2-download-http "http://udisks.freedesktop.org/releases/udisks-&udisks2-version;.tar.bz2">
+  <!ENTITY udisks2-download-http "https://github.com/storaged-project/udisks/releases/download/udisks-&udisks2-version;/udisks-&udisks2-version;.tar.bz2">
   <!ENTITY udisks2-download-ftp  " ">
-  <!ENTITY udisks2-md5sum        "501d11c243bd8c6c00650474cd2afaab">
-  <!ENTITY udisks2-size          "912 KB">
-  <!ENTITY udisks2-buildsize     "26 MB (with tests)">
+  <!ENTITY udisks2-md5sum        "1e46bdb613cbbc2d175b9df71e43cae8">
+  <!ENTITY udisks2-size          "1.2 MB">
+  <!ENTITY udisks2-buildsize     "33 MB (with tests)">
   <!ENTITY udisks2-time          "0.3 SBU (with tests)">
 ]>
 
@@ -36,6 +36,7 @@
     </para>
 
     &lfs80_checked;
+    &gcc7_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -93,11 +94,12 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gptfdisk"/>,
+      <xref linkend="btrfs-progs"/>,
       <xref linkend="gtk-doc"/>,
+      <xref linkend="lvm2"/>,
       <xref linkend="ntfs-3g"/>,
-      <xref linkend="parted"/>, and
-      <ulink url="https://github.com/dosfstools/dosfstools">dosfstools</ulink>
+      <ulink url="https://github.com/sahlberg/libiscsi">libiscsi</ulink>, and
+      <ulink url="https://github.com/rhinstaller/libblockdev">libblockdev</ulink>
     </para>
 
     <para condition="html" role="usernotes">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 7d349712b7..204873edab 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,26 @@
     <listitem>
       <para>May 19th, 2017</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to btrfs-progs-4.11. Fixes
+          <ulink url="&blfs-ticket-root;9260">#9260</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to nano-2.8.3. Fixes
+          <ulink url="&blfs-ticket-root;9259">#9259</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to udisks-2.6.5. Fixes
+          <ulink url="&blfs-ticket-root;9258">#9258</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to npth-1.4. Fixes
+          <ulink url="&blfs-ticket-root;9254">#9254</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gnupg-2.1.21. Fixes
+          <ulink url="&blfs-ticket-root;9253">#9253</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[ken] - Use separate QtWebEngine instead of building
           it as part of Qt5. Fixes
diff --git a/packages.ent b/packages.ent
index b248618fdf..887508edcf 100644
--- a/packages.ent
+++ b/packages.ent
@@ -12,7 +12,7 @@
 <!ENTITY consolekit-version           "1.0.2">
 <!ENTITY cracklib-version             "2.9.6">
 <!ENTITY cyrus-sasl-version           "2.1.26">
-<!ENTITY gnupg2-version               "2.1.20">
+<!ENTITY gnupg2-version               "2.1.21">
 <!ENTITY gnutls-version               "3.5.12">
 <!ENTITY gpgme-version                "1.9.0">
 <!ENTITY haveged-version              "1.9.1">
@@ -44,7 +44,7 @@
 <!ENTITY tripwire-version             "2.4.3.5">
 
 <!-- Chapter 5 -->
-<!ENTITY btrfs-progs-version          "4.10.2">
+<!ENTITY btrfs-progs-version          "4.11">
 <!ENTITY fuse3-version                "3.0.1">
 <!ENTITY fuse2-version                "2.9.7">
 <!ENTITY jfsutils-version             "1.1.15">
@@ -64,7 +64,7 @@
 <!ENTITY ed-version                   "1.14.2">
 <!ENTITY emacs-version                "25.2">
 <!ENTITY joe-version                  "4.4">
-<!ENTITY nano-version                 "2.8.2">
+<!ENTITY nano-version                 "2.8.3">
 <!ENTITY vim-version                  "8.0.586">
 <!ENTITY vim-majmin                   "80">
 
@@ -158,7 +158,7 @@
 <!ENTITY lzo-version                  "2.10">
 <!ENTITY mtdev-version                "1.1.5">
 <!ENTITY nodejs-version               "7.10.0">
-<!ENTITY npth-version                 "1.3">
+<!ENTITY npth-version                 "1.4">
 <!ENTITY nspr-version                 "4.14">
 <!ENTITY openobex-version             "1.7.2">
 <!ENTITY pcre-version                 "8.40">
@@ -269,7 +269,7 @@
 <!ENTITY sysstat-version              "11.5.6">
 <!ENTITY systemd-version              "233">
 <!ENTITY udisks-version               "1.0.5">    <!-- stable lt .90 micro version -->
-<!ENTITY udisks2-version              "2.1.8">    <!-- stable lt .90 micro version -->
+<!ENTITY udisks2-version              "2.6.5">    <!-- stable lt .90 micro version -->
 <!ENTITY unrar-version                "5.5.3">
 <!ENTITY unzip-version                "6.0">
 <!ENTITY upower-version               "0.99.4">
diff --git a/postlfs/editors/nano.xml b/postlfs/editors/nano.xml
index 1adb62e6ff..420f608d54 100644
--- a/postlfs/editors/nano.xml
+++ b/postlfs/editors/nano.xml
@@ -7,10 +7,10 @@
   <!-- Note minor version in URL -->
   <!ENTITY nano-download-http "https://www.nano-editor.org/dist/v2.8/nano-&nano-version;.tar.xz">
   <!ENTITY nano-download-ftp  " ">
-  <!ENTITY nano-md5sum        "088e6a6ac6df028f7cd2ea90c7b790e9">
+  <!ENTITY nano-md5sum        "aacfbb7d99fbb5ed0cb64c4e064663b8">
   <!ENTITY nano-size          "1.4 MB">
   <!ENTITY nano-buildsize     "16 MB">
-  <!ENTITY nano-time          "0.4 SBU">
+  <!ENTITY nano-time          "0.2 SBU">
 ]>
 
 <sect1 id="nano" xreflabel="nano-&nano-version;">
diff --git a/postlfs/filesystems/btrfs-progs.xml b/postlfs/filesystems/btrfs-progs.xml
index 549d7f1f04..a2f257ade3 100644
--- a/postlfs/filesystems/btrfs-progs.xml
+++ b/postlfs/filesystems/btrfs-progs.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY btrfs-progs-download-http  "https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v&btrfs-progs-version;.tar.xz">
   <!ENTITY btrfs-progs-download-ftp  " ">
-  <!ENTITY btrfs-progs-md5sum        "f02817482466d40dabfa08534da42ec9">
+  <!ENTITY btrfs-progs-md5sum        "25ba238f44b9a1a54e62f7b361bdc9d8">
   <!ENTITY btrfs-progs-size          "1.4 MB">
   <!ENTITY btrfs-progs-buildsize     "42 MB (add 945 MB for tests)">
-  <!ENTITY btrfs-progs-time          "0.4 SBU (add 9.4 SBU for tests)">
+  <!ENTITY btrfs-progs-time          "0.3 SBU (add 9.4 SBU for tests)">
 ]>
 
 <sect1 id="btrfs-progs" xreflabel="btrfs-progs-&btrfs-progs-version;">
@@ -114,9 +114,9 @@ make</userinput></screen>
 
 <screen><userinput>mv tests/fuzz-tests/001-simple-check-unmounted/test.sh{,.broken}   &amp;&amp;
 mv tests/fuzz-tests/003-multi-check-unmounted/test.sh{,.broken}    &amp;&amp;
+mv tests/fuzz-tests/004-simple-dump-tree/test.sh{,.broken}         &amp;&amp;
 mv tests/fuzz-tests/007-simple-super-recover/test.sh{,.broken}     &amp;&amp;
 mv tests/fuzz-tests/009-simple-zero-log/test.sh{,.broken}          &amp;&amp;
-mv tests/mkfs-tests/005-long-device-name-for-ssd/test.sh{,.broken} &amp;&amp;
 mv tests/misc-tests/019-receive-clones-on-munted-subvol/test.sh{,.broken}</userinput></screen>
 
     <para>To test the results, issue (as the <systemitem
diff --git a/postlfs/security/gnupg2.xml b/postlfs/security/gnupg2.xml
index 3487e1a2af..20d92b542f 100644
--- a/postlfs/security/gnupg2.xml
+++ b/postlfs/security/gnupg2.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY gnupg2-download-http "https://gnupg.org/ftp/gcrypt/gnupg/gnupg-&gnupg2-version;.tar.bz2">
   <!ENTITY gnupg2-download-ftp  "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-&gnupg2-version;.tar.bz2">
-  <!ENTITY gnupg2-md5sum        "f6bc7e0b82893dfafe09109d86ff6e9b">
+  <!ENTITY gnupg2-md5sum        "685ebf4c3a7134ba0209c96b18b2f064">
   <!ENTITY gnupg2-size          "6.2 MB">
-  <!ENTITY gnupg2-buildsize     "108 MB (with makeinfo docs)">
-  <!ENTITY gnupg2-time          "0.8 SBU (with makeinfo docs, add 1.2 SBU for tests)">
+  <!ENTITY gnupg2-buildsize     "106 MB (with makeinfo docs)">
+  <!ENTITY gnupg2-time          "0.8 SBU (with makeinfo docs, add 2.6 SBU for tests)">
 ]>
 
 <sect1 id="gnupg2" xreflabel="GnuPG-&gnupg2-version;">
@@ -38,6 +38,7 @@
     S/MIME.</para>
 
     &lfs80_checked;
+    &gcc7_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -122,12 +123,6 @@
 <screen><userinput>sed -e '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' \
     -i tools/Makefile.in</userinput></screen>
 
-    <para>Some tests will hang infinitely without modifications.  If you will
-    run the tests, comment the failing portions of the tests:</para>
-
-<screen><userinput>sed -i -e '/^  test_agent_protect/s:^://:' agent/t-protect.c &amp;&amp;
-sed -i -e '174,186 s/^/;;/'                tests/openpgp/ecc.scm</userinput></screen>
-
     <para>Install <application>GnuPG</application> by running the following
     commands:</para>