Index: general.ent
===================================================================
--- general.ent	(revision 933d7c9cd167b7f39d35e703c31db4a9751ef797)
+++ general.ent	(revision 0f53ca47ad5b00fef3a48f816bc621f364c5117b)
@@ -436,5 +436,5 @@
 <!ENTITY rpcbind-version              "0.2.1">
 <!ENTITY rsync-version                "3.1.0">
-<!ENTITY samba-version                "4.1.3">
+<!ENTITY samba-version                "4.1.4">
 <!ENTITY wget-version                 "1.14">
 <!ENTITY wireless-tools-version       "29">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 933d7c9cd167b7f39d35e703c31db4a9751ef797)
+++ introduction/welcome/changelog.xml	(revision 0f53ca47ad5b00fef3a48f816bc621f364c5117b)
@@ -45,4 +45,14 @@
 -->
     <listitem>
+      <para>January 12th, 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[fernando] - Update to Samba-4.1.4. Fixes
+          <ulink url="&blfs-ticket-root;4547">#4547</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>January 11th, 2014</para>
       <itemizedlist>
Index: networking/netprogs/samba.xml
===================================================================
--- networking/netprogs/samba.xml	(revision 933d7c9cd167b7f39d35e703c31db4a9751ef797)
+++ networking/netprogs/samba.xml	(revision 0f53ca47ad5b00fef3a48f816bc621f364c5117b)
@@ -7,8 +7,10 @@
   <!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        "a5dbfe87f4cb3d9d91e15e5df99a59a1">
+  <!ENTITY samba-md5sum        "c7871012ac40b8c74afff42bbd873bd7">
   <!ENTITY samba-size          "23 MB">
-  <!ENTITY samba-buildsize     "493 MB (up to 900MB additional for all tests)">
-  <!ENTITY samba-time          "6.6 SBU (up to 110 SBU to run all tests)">
+  <!ENTITY samba-buildsize     "467 MB (additional 27 MB for the quicktest,
+                                reputedly up to 900 MB additional for all tests)">
+  <!ENTITY samba-time          "5.7 SBU (additional 1.2 SBU for the quicktest,
+                                reputedly up to 110 SBU to run all tests)">
 ]>
 
@@ -124,7 +126,13 @@
 
     <para>To test the results, as the <systemitem
-    class="username">root</systemitem> user,issue: <command>make
-    quicktest</command> (about 8 SBU).  There are other targets (test,
-    subunit-test) available, but take a very long (over 100 SBU) time.</para>
+    class="username">root</systemitem> user, issue: <command>make
+    quicktest</command>.  There are other targets (test, subunit-test)
+    available, but take a very long time (over 100 SBU).</para>
+
+    <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>
+
+<screen><userinput>sed -i "/samba3.blackbox.failure.failure/i \^samba3.raw.eas" selftest/knownfail</userinput></screen>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
@@ -297,5 +305,14 @@
         <quote>dos charset</quote> and <quote>unix charset</quote> parameters
         to the <quote>[global]</quote> section as described in Scenario 1 in
-        order to prevent filename corruption.</para>
+        order to prevent filename corruption. For security reasons, you may
+        wish to define
+        <replaceable>path = /home/alice/shared-files</replaceable>,
+        assuming your user name is <replaceable>alice</replaceable> and you
+        only want to share the files in that directory, instead of your entire
+        home. Then, replace <replaceable>homes</replaceable> by
+        <replaceable>shared-files</replaceable> and change also the
+        <quote><literal>comment</literal></quote> if used the configuration
+        file below or the <filename>/etc/samba/smb.conf.default</filename>
+        to create yours.</para>
 
         <para>The following configuration file creates a separate share for each
@@ -465,5 +482,8 @@
         character set, filesystem and support modules.</seg>
         
-        <seg>/etc/samba, /usr/include/samba-4.0, /usr/lib/samba,
+        <seg>/etc/samba, /usr/include/samba-4.0,
+        /usr/lib/python&python2-majorver;/site-packages/samba,
+        /usr/lib/samba, /usr/share/doc/samba-&samba-version;,
+        /usr/share/perl5/Parse/Pidl/Samba{3,4},
         /usr/share/samba, /var/cache/samba, /var/lib/samba, /var/lock/samba,
         /var/log/samba, and /var/run/samba</seg>
