Index: general.ent
===================================================================
--- general.ent	(revision 28690a0daf7125776d4d0a160d75a24f427c0296)
+++ general.ent	(revision 99ece5d365fa2a7c63ca4c68ea5126e6d579fc6f)
@@ -451,5 +451,5 @@
 <!ENTITY rpcbind-version              "0.2.1">
 <!ENTITY rsync-version                "3.1.0">
-<!ENTITY samba-version                "4.1.7">
+<!ENTITY samba-version                "4.1.8">
 <!ENTITY wget-version                 "1.15">
 <!ENTITY wireless-tools-version       "29">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 28690a0daf7125776d4d0a160d75a24f427c0296)
+++ introduction/welcome/changelog.xml	(revision 99ece5d365fa2a7c63ca4c68ea5126e6d579fc6f)
@@ -48,4 +48,8 @@
       <itemizedlist>
         <listitem>
+          <para>[fernando] - samba-4.1.8. Fixes
+          <ulink url="&blfs-ticket-root;5132">#5132</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[igor] - Update to wpa_supplicant-2.2. Fixes
           <ulink url="&blfs-ticket-root;5137">#5137</ulink>.</para>
Index: networking/netprogs/samba.xml
===================================================================
--- networking/netprogs/samba.xml	(revision 28690a0daf7125776d4d0a160d75a24f427c0296)
+++ networking/netprogs/samba.xml	(revision 99ece5d365fa2a7c63ca4c68ea5126e6d579fc6f)
@@ -7,10 +7,8 @@
   <!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        "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)">
+  <!ENTITY samba-md5sum        "212b7568d44e7668a7dc8a45c5558764">
+  <!ENTITY samba-size          "23 MB">
+  <!ENTITY samba-buildsize     "459 MB (additional 396 MB for the quicktest, reputedly up to 500 MB additional for all tests)">
+  <!ENTITY samba-time          "6.1 SBU (additional 4.1 SBU for the quicktest, reputedly up to 110 SBU to run all tests)">
 ]>
 
@@ -116,8 +114,22 @@
     --with-piddir=/run/samba            \
     --with-pammodulesdir=/lib/security  \
+    --without-systemd                   \
     --enable-fhs                        \
     --enable-nss-wrapper                &amp;&amp;
 
 make</userinput></screen>
+
+    <para>According to <application>Samba</application> developers, the
+    limitation to 108 characters of the path length of a unix named pipe socket
+    may be the cause of errors, so that over 1/3 of the tests might fail. For
+    this reason, the switch <option>--with-selftest-prefix=/tmp/quick</option>
+    (or another path with small number of characters) can be used with
+    configure. Even so, the 
+    <quote><replaceable>samba3.raw.eas</replaceable></quote> test may fail,
+    apparently for the same reason. If one quicktest fails, it can be disabled.
+    For example, <quote><replaceable>samba3.raw.eas</replaceable></quote> may
+    be disabled with the following command:</para>
+
+<screen><userinput>sed -i "/samba3.blackbox.failure.failure/i \^samba3.raw.eas" selftest/knownfail</userinput></screen>
 
     <para>To test the results, as the <systemitem
@@ -125,11 +137,4 @@
     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 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>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
@@ -170,7 +175,15 @@
     library.</para>
 
+    <para><parameter>--without-systemd</parameter>: Disable
+    <application>systemd</application> integration, which is not part of
+    LFS/BLFS. If you use <application>systemd</application>, replace by
+    <parameter>--with-systemd</parameter>.</para>
+
     <para><option>--enable-socket-wrapper</option> and
     <option>--enable-selftest</option>: These options are required to run
     the test suite.</para>
+
+    <para><option>--with-selftest-prefix=SELFTEST_PREFIX</option>: This option
+    specify the test suite work directory (default=./st).</para>
 
     <para><command>mv -v /usr/lib/libnss_win{s,bind}.so* /lib</command>:
@@ -465,12 +478,12 @@
         libtorture.so, libwbclient.so, mit_samba.so, the pam_winbind.so and
         pam_smbpass.so PAM libraries, winbind_krb5_locator.so, and assorted
-        character set, filesystem and support modules.</seg>
+        character set, filesystem and support modules under
+        /usr/lib/{python&python2-majorver;,samba}</seg>
         
         <seg>/etc/samba, /run/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>
+        /usr/lib/perl5/vendor_perl/5.x.y/Parse/Pidl/Samba{3,4},
+        /usr/lib/python&python2-majorver;/site-packages/samba, /usr/lib/samba,
+        /usr/share/doc/samba-&samba-version;, /usr/share/samba, and
+        /var/{cache,lib,lock,log,run}/samba</seg>
 
       </seglistitem>
