Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 2b6bbdd878e8b20559d53ce227815b7be5c57995)
+++ introduction/welcome/changelog.xml	(revision 3f3f2c8a7edacddd9a2d89fcafa9b5547dc321be)
@@ -45,4 +45,8 @@
       <para>December 25th, 2019</para>
       <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to cifs-utils-6.10. Fixes
+          <ulink url="&blfs-ticket-root;12921">#12921</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[thomas] - Update to dhcpcd-8.1.4. Fixes
Index: networking/netprogs/cifsutils.xml
===================================================================
--- networking/netprogs/cifsutils.xml	(revision 2b6bbdd878e8b20559d53ce227815b7be5c57995)
+++ networking/netprogs/cifsutils.xml	(revision 3f3f2c8a7edacddd9a2d89fcafa9b5547dc321be)
@@ -7,8 +7,8 @@
   <!ENTITY cifsutils-download-http "https://www.samba.org/ftp/linux-cifs/cifs-utils/cifs-utils-&cifsutils-version;.tar.bz2">
   <!ENTITY cifsutils-download-ftp  " ">
-  <!ENTITY cifsutils-md5sum        "6ae854852e39ab1d5e2e3b512fdffb08">
-  <!ENTITY cifsutils-size          "392 KB">
-  <!ENTITY cifsutils-buildsize     "4.8 MB">
-  <!ENTITY cifsutils-time          "less than 0.1 SBU">
+  <!ENTITY cifsutils-md5sum        "1cb2d653ccc77f8644213340a4f6b7dc">
+  <!ENTITY cifsutils-size          "356 KB">
+  <!ENTITY cifsutils-buildsize     "4.9 MB">
+  <!ENTITY cifsutils-time          "0.1 SBU">
 ]>
 
@@ -89,5 +89,10 @@
 <screen><literal>File systems  ---&gt;
   [*] Network File Systems  ---&gt;                                      [CONFIG_NETWORK_FILESYSTEMS]
-    &lt;*/M&gt; CIFS support (advanced network filesystem, SMBFS successor) [CONFIG_CIFS]</literal></screen>
+    &lt;*/M&gt; SMB3 and CIFS support (advanced network filesystem) [CONFIG_CIFS]</literal></screen>
+
+    <para>
+      Depending on your server configuration, additional kernel options may be
+      required.
+    </para>
 
     <indexterm zone="cifsutils cifsutils-kernel">
@@ -103,10 +108,12 @@
     commands:</para>
 
-<screen revision="sysv"><userinput>./configure --prefix=/usr \
+<screen revision="sysv"><userinput>autoreconf -fiv           &amp;&amp;
+./configure --prefix=/usr \
             --disable-pam \
             --disable-systemd &amp;&amp;
 make</userinput></screen>
 
-<screen revision="systemd"><userinput>./configure --prefix=/usr \
+<screen revision="systemd"><userinput>autoreconf -fiv           &amp;&amp;
+./configure --prefix=/usr \
             --disable-pam &amp;&amp;
 make</userinput></screen>
@@ -115,4 +122,10 @@
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<!-- Note to editors: You need to define ROOTSBINDIR and man8dir, like this:
+     ROOTSBINDIR=<DESTDIR>/sbin man8dir=<DESTDIR>/usr/share/man/man8
+     This is due to a bug in the makefile for cifs-utils-6.10, since it tries
+     to install symlinks for mount.smb3 without thinking about DESTDIR
+     installations. -->
 
 <screen role="root"><userinput>make install</userinput></screen>
@@ -148,6 +161,6 @@
 
       <seglistitem>
-        <seg> getcifsacl, mount.cifs, setcifsacl, and smbinfo;
-          optional: cifs.idmap, cifs.upcall and cifscreds</seg>
+        <seg> cifs.idmap, cifs.upcall, cifscreds, getcifsacl, 
+          mount.cifs, mount.smb3, setcifsacl, smb2-quota, and smbinfo</seg>
         <seg>/usr/lib/cifs-utils/idmapwb.so and optionally
           PAM module /lib/security/pam_cifscreds.so</seg>
@@ -222,4 +235,16 @@
       </varlistentry>
 
+      <varlistentry id="mount.smb3">
+        <term><command>mount.smb3</command></term>
+        <listitem>
+          <para>mounts a SMB3-based filesystem. It is usually invoked
+          indirectly by the mount(8) command when using the "-t smb3" option.
+          </para>
+          <indexterm zone="cifsutils mount.smb3">
+            <primary sortas="b-mount.smb3">mount.smb3</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="setcifsacl">
         <term><command>setcifsacl</command></term>
@@ -233,4 +258,14 @@
       </varlistentry>
 
+      <varlistentry id="smb2-quota">
+        <term><command>smb3-quota</command></term>
+        <listitem>
+          <para>displays quota information for a SMB filesystem.</para>
+          <indexterm zone="cifsutils smb2-quota">
+            <primary sortas="b-smb2-quota">smb2-quota</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="smbinfo">
         <term><command>smbinfo</command></term>
Index: packages.ent
===================================================================
--- packages.ent	(revision 2b6bbdd878e8b20559d53ce227815b7be5c57995)
+++ packages.ent	(revision 3f3f2c8a7edacddd9a2d89fcafa9b5547dc321be)
@@ -553,5 +553,5 @@
 <!-- Chapter 15 -->
 <!ENTITY bridgeutils-version          "1.6">
-<!ENTITY cifsutils-version            "6.9">
+<!ENTITY cifsutils-version            "6.10">
 <!ENTITY iw-version                   "5.4">
 <!ENTITY ncftp-version                "3.2.6">
