Index: general/genlib/libblockdev.xml
===================================================================
--- general/genlib/libblockdev.xml	(revision 0a30e8efc4b1aec1ca76797d81bd8b56ce242d15)
+++ general/genlib/libblockdev.xml	(revision 8ca79946d4c82d15a0b883b8ea584e4188fa5599)
@@ -91,6 +91,6 @@
       <xref linkend="gtk-doc"/>,
       <xref linkend="mdadm"/>,
-      <ulink url="http://dmraid.sourcearchive.com/">dmraid</ulink>, and 
-      <ulink url="http://bcachefs.org/">bcachefs</ulink>
+      <ulink url="http://people.redhat.com/~heinzm/sw/dmraid/">dmraid</ulink>,
+      <ulink url="http://bcachefs.org/">bcachefs</ulink>, and
       <ulink url="https://github.com/pmem/ndctl">ndctl</ulink>
     </para>
Index: general/sysutils/udisks2.xml
===================================================================
--- general/sysutils/udisks2.xml	(revision 0a30e8efc4b1aec1ca76797d81bd8b56ce242d15)
+++ general/sysutils/udisks2.xml	(revision 8ca79946d4c82d15a0b883b8ea584e4188fa5599)
@@ -7,7 +7,7 @@
   <!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        "9e0fb5766ad542af920435cc5a68a749">
+  <!ENTITY udisks2-md5sum        "32ae8b6d9aaf71d4609d3fb6b81d56e9">
   <!ENTITY udisks2-size          "1.3 MB">
-  <!ENTITY udisks2-buildsize     "35 MB (with tests)">
+  <!ENTITY udisks2-buildsize     "50 MB (with tests)">
   <!ENTITY udisks2-time          "0.3 SBU (with tests)">
 ]>
Index: gnome/platform/dconf.xml
===================================================================
--- gnome/platform/dconf.xml	(revision 0a30e8efc4b1aec1ca76797d81bd8b56ce242d15)
+++ gnome/platform/dconf.xml	(revision 8ca79946d4c82d15a0b883b8ea584e4188fa5599)
@@ -11,5 +11,5 @@
   <!ENTITY dconf-size          "100 KB">
   <!ENTITY dconf-buildsize     "7.1 MB">
-  <!ENTITY dconf-time          "less than0.1 SBU">
+  <!ENTITY dconf-time          "less than 0.1 SBU">
 
 <!-- DConf-Editor -->
@@ -162,5 +162,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --sysconfdir=/etc &amp;&amp;
+meson --prefix=/usr --sysconfdir=/etc .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -184,5 +184,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --sysconfdir=/etc &amp;&amp;
+meson --prefix=/usr --sysconfdir=/etc .. &amp;&amp;
 ninja</userinput></screen>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 0a30e8efc4b1aec1ca76797d81bd8b56ce242d15)
+++ introduction/welcome/changelog.xml	(revision 8ca79946d4c82d15a0b883b8ea584e4188fa5599)
@@ -45,4 +45,13 @@
       <para>August 18th, 2018</para>
       <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to udisks-2.8.0. Fixes
+          <ulink url="&blfs-ticket-root;10917">#10917</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to samba-4.8.4. Fixes
+          <ulink url="&blfs-ticket-root;11021">#11021</ulink>. Note that this
+          fixes four critical vulnerabilities, upgrading is suggested.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Update to babl-0.1.56. Fixes
Index: networking/netlibs/libnsl.xml
===================================================================
--- networking/netlibs/libnsl.xml	(revision 0a30e8efc4b1aec1ca76797d81bd8b56ce242d15)
+++ networking/netlibs/libnsl.xml	(revision 8ca79946d4c82d15a0b883b8ea584e4188fa5599)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libnsl-download-http "https://github.com/thkukuk/libnsl/archive/v&libnsl-version;/libnsl-&libnsl-version;.tar.gz">
+  <!ENTITY libnsl-download-http "https://github.com/thkukuk/libnsl/archive/v&libnsl-version;.tar.gz">
   <!ENTITY libnsl-download-ftp  " ">
   <!ENTITY libnsl-md5sum        "05222024777e12e2f6d48f2e7d067ac7">
@@ -33,5 +33,5 @@
       The <application>libnsl</application> package contains the public client
       interface for NIS(YP) and NIS+. It replaces the NIS library that used to
-      be in GlibC.
+      be in glibc.
     </para>
 
@@ -71,4 +71,16 @@
       </listitem>
     </itemizedlist>
+
+    <note>
+      <para>
+        The <application>libnsl</application> source tarball shown above
+        downloads with the correct name, libnsl-&libnsl-version;.tar.gz, if
+        using a standard web browser. If you prefer to use a command line
+        program such as wget, you normally would obtain &libnsl-version;.tar.gz.
+        To obtain this package with the proper filename, run:
+
+<screen><userinput>wget -c https://github.com/thkukuk/libnsl/archive/v1.2.0.tar.gz -O libnsl-&libnsl-version;.tar.gz</userinput></screen>
+      </para>
+    </note>
 
     <bridgehead renderas="sect3">libnsl Dependencies</bridgehead>
Index: networking/netlibs/rpcsvc-proto.xml
===================================================================
--- networking/netlibs/rpcsvc-proto.xml	(revision 0a30e8efc4b1aec1ca76797d81bd8b56ce242d15)
+++ networking/netlibs/rpcsvc-proto.xml	(revision 8ca79946d4c82d15a0b883b8ea584e4188fa5599)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY rpcsvc-proto-download-http "https://github.com/thkukuk/rpcsvc-proto/archive/v&rpcsvc-proto-version;/rpcsvc-proto-&rpcsvc-proto-version;.tar.gz">
+  <!ENTITY rpcsvc-proto-download-http "https://github.com/thkukuk/rpcsvc-proto/releases/download/v&rpcsvc-proto-version;/rpcsvc-proto-&rpcsvc-proto-version;.tar.gz">
   <!ENTITY rpcsvc-proto-download-ftp  " ">
   <!ENTITY rpcsvc-proto-md5sum        "3b2724bb7d6560ddcb4dbcdb5465de10">
@@ -32,5 +32,5 @@
     <para>
       The <application>rpcsvc-proto</application> package contains the rcpsvc 
-      protocol.x files and headers, formerly included with GlibC, that are not
+      protocol.x files and headers, formerly included with glibc, that are not
       included in replacement <xref linkend="libtirpc"/>, along with the rpcgen
       program.
Index: networking/netprogs/samba.xml
===================================================================
--- networking/netprogs/samba.xml	(revision 0a30e8efc4b1aec1ca76797d81bd8b56ce242d15)
+++ networking/netprogs/samba.xml	(revision 8ca79946d4c82d15a0b883b8ea584e4188fa5599)
@@ -7,8 +7,8 @@
   <!ENTITY samba-download-http "https://www.samba.org/ftp/samba/stable/samba-&samba-version;.tar.gz">
   <!ENTITY samba-download-ftp  " ">
-  <!ENTITY samba-md5sum        "67f271ed6b793c2acfe014b5b8f0cca8">
+  <!ENTITY samba-md5sum        "ca5bfbebd8d9eb95506e16594b2bbee2">
   <!ENTITY samba-size          "17 MB">
-  <!ENTITY samba-buildsize     "469 MB (add 15 MB for quicktest)">
-  <!ENTITY samba-time          "5.4 SBU (add 0.5 SBU for quicktest)">
+  <!ENTITY samba-buildsize     "588 MB (add 373 MB for quicktest)">
+  <!ENTITY samba-time          "4.4 SBU (add 4.4 SBU for quicktest)">
 ]>
 
Index: packages.ent
===================================================================
--- packages.ent	(revision 0a30e8efc4b1aec1ca76797d81bd8b56ce242d15)
+++ packages.ent	(revision 8ca79946d4c82d15a0b883b8ea584e4188fa5599)
@@ -293,5 +293,5 @@
 <!ENTITY systemd-version              "239">
 <!ENTITY udisks-version               "1.0.5">    <!-- stable lt .90 micro version -->
-<!ENTITY udisks2-version              "2.7.6">    <!-- stable lt .90 micro version -->
+<!ENTITY udisks2-version              "2.8.0">    <!-- stable lt .90 micro version -->
 <!ENTITY unrar-version                "5.6.5">
 <!ENTITY unzip-version                "6.0">
@@ -443,5 +443,5 @@
 <!ENTITY rpcbind-version              "0.2.4">
 <!ENTITY rsync-version                "3.1.3">
-<!ENTITY samba-version                "4.8.3">
+<!ENTITY samba-version                "4.8.4">
 <!ENTITY wget-version                 "1.19.5">
 <!ENTITY wireless-tools-version       "29">
