diff --git a/general.ent b/general.ent
index 137d629308..c65427e2e6 100644
--- a/general.ent
+++ b/general.ent
@@ -448,7 +448,7 @@ export -f as_root</userinput></screen>
 <!ENTITY ntp-version                  "4.2.6p5">
 <!ENTITY rpcbind-version              "0.2.1">
 <!ENTITY rsync-version                "3.1.0">
-<!ENTITY samba-version                "4.1.6">
+<!ENTITY samba-version                "4.1.7">
 <!ENTITY wget-version                 "1.15">
 <!ENTITY wireless-tools-version       "29">
 <!ENTITY wpa_supplicant-version       "2.1">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 93c7c55739..ad4290cb0c 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -47,6 +47,10 @@
     <listitem>
       <para>April 17th, 2014</para>
       <itemizedlist>
+       <listitem>
+          <para>[bdubbs] - Updated to samba-4.1.7. Fixes
+          <ulink url="&blfs-ticket-root;4972">#4972</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[fernando] - gnome-system-monitor-3.12.1. Partially fixes
           <ulink url="&blfs-ticket-root;4958">#4958</ulink>.</para>
diff --git a/networking/netprogs/samba.xml b/networking/netprogs/samba.xml
index ce141f6eeb..e8f5c8fff7 100644
--- a/networking/netprogs/samba.xml
+++ b/networking/netprogs/samba.xml
@@ -6,11 +6,11 @@
 
   <!ENTITY samba-download-http "http://ftp.samba.org/pub/samba/stable/samba-&samba-version;.tar.gz">
   <!ENTITY samba-download-ftp  "ftp://ftp.samba.org/pub/samba/stable/samba-&samba-version;.tar.gz">
-  <!ENTITY samba-md5sum        "9dc64658c0cc81e7637f9b975c19638c">
-  <!ENTITY samba-size          "23 MB">
-  <!ENTITY samba-buildsize     "468 MB (additional 27 MB for the quicktest,
-                                reputedly up to 900 MB additional for all tests)">
-  <!ENTITY samba-time          "6.0 SBU (additional 1.2 SBU for the quicktest,
+  <!ENTITY samba-md5sum        "bc44b0a245468c3574ef07644206ede3">
+  <!ENTITY samba-size          "22 MB">
+  <!ENTITY samba-buildsize     "504 MB (additional 27 MB for the quicktest,
+                                reputedly up to 500 MB additional for all tests)">
+  <!ENTITY samba-time          "7.9 SBU (additional 8.7 SBU for the quicktest,
                                 reputedly up to 110 SBU to run all tests)">
 ]>
 
@@ -110,9 +110,7 @@
     <para>Install <application>Samba</application> by running the following
     commands:</para>
 
-<screen><userinput>sed -e "s:(Function \*)callback:(rl_command_func_t \*)callback:g" \
-    -i libcli/smbreadline/smbreadline.c &amp;&amp;
-./configure                             \
+<screen><userinput>./configure                             \
     --prefix=/usr                       \
     --sysconfdir=/etc                   \
     --localstatedir=/var                \
@@ -130,7 +128,8 @@ make</userinput></screen>
 
     <para>If one quicktest fails, it can be disabled. For example,
     <quote><replaceable>samba3.raw.eas</replaceable></quote> has been reported
-    to fail. To disable it, run the following command:</para>
+    to fail for prior Samba versions. To disable it, run the following 
+    command:</para>
 
 <screen><userinput>sed -i "/samba3.blackbox.failure.failure/i \^samba3.raw.eas" selftest/knownfail</userinput></screen>