diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 8663805f16..e21bd13619 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,10 @@
     <listitem>
       <para>July 17th, 2017</para>
       <itemizedlist>
+        <listitem>
+          <para>[dj] - Update to Samba-4.6.6. Fixes
+          <ulink url="&blfs-ticket-root;9477">#9477</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[dj] - Update to Node.JS-8.1.4. Fixes
           <ulink url="&blfs-ticket-root;9472">#9472</ulink>.</para>
diff --git a/networking/netprogs/samba.xml b/networking/netprogs/samba.xml
index d7785d6c2d..e72969d9e3 100644
--- a/networking/netprogs/samba.xml
+++ b/networking/netprogs/samba.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY samba-download-http "https://download.samba.org/pub/samba/stable/samba-&samba-version;.tar.gz">
   <!ENTITY samba-download-ftp  " ">
-  <!ENTITY samba-md5sum        "2ae8ce2862d8bfa95e4681371ebb1623">
+  <!ENTITY samba-md5sum        "04493bbe8d71e52393dffdbba301697d">
   <!ENTITY samba-size          "21 MB">
-  <!ENTITY samba-buildsize     "567 MB (add 371 MB for quicktest, add up to 1.6 GB additional for developer tests)">
-  <!ENTITY samba-time          "9.2 SBU (add 4.4 SBU for quicktest, and up to 280 SBU to run developer tests)">
+  <!ENTITY samba-buildsize     "566 MB (add 371 MB for quicktest, add up to 1.6 GB additional for developer tests)">
+  <!ENTITY samba-time          "8.9 SBU (add 4.4 SBU for quicktest, and up to 280 SBU to run developer tests)">
 ]>
 
 <sect1 id="samba" xreflabel="Samba-&samba-version;">
diff --git a/packages.ent b/packages.ent
index 7f5a01463a..912c733f25 100644
--- a/packages.ent
+++ b/packages.ent
@@ -423,7 +423,7 @@
 <!ENTITY ntp-version                  "4.2.8p10">
 <!ENTITY rpcbind-version              "0.2.4">
 <!ENTITY rsync-version                "3.1.2">
-<!ENTITY samba-version                "4.6.5">
+<!ENTITY samba-version                "4.6.6">
 <!ENTITY wget-version                 "1.19.1">
 <!ENTITY wireless-tools-version       "29">
 <!ENTITY wpa_supplicant-version       "2.6">