diff --git a/general.ent b/general.ent
index 2e7a874c45..d53361462e 100644
--- a/general.ent
+++ b/general.ent
@@ -463,7 +463,7 @@ export -f as_root</userinput></screen>
 <!ENTITY ntp-version                  "4.2.6p5">
 <!ENTITY rpcbind-version              "0.2.0">
 <!ENTITY rsync-version                "3.0.9">
-<!ENTITY samba3-version               "3.6.7">
+<!ENTITY samba3-version               "3.6.8">
 <!ENTITY wget-version                 "1.14">
 <!ENTITY wireless-tools-version       "29">
 <!ENTITY wpa_supplicant-version       "1.0">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index c4626e825b..734889ea4a 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -46,6 +46,10 @@
     <listitem>
       <para>October 24nd, 2012</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to samba-3.6.8. Fixes
+          <ulink url="&blfs-ticket-root;3600">#3600</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Update to git-1.8.0. Fixes
           <ulink url="&blfs-ticket-root;3589">#3589</ulink>.</para>
diff --git a/networking/netprogs/samba3.xml b/networking/netprogs/samba3.xml
index 954873c185..dbcd5642eb 100644
--- a/networking/netprogs/samba3.xml
+++ b/networking/netprogs/samba3.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY samba3-download-http "http://ftp.samba.org/pub/samba/stable/samba-&samba3-version;.tar.gz">
   <!ENTITY samba3-download-ftp  "ftp://ftp.samba.org/pub/samba/stable/samba-&samba3-version;.tar.gz">
-  <!ENTITY samba3-md5sum        "b23be56c15dd52f64eb7ba54c0ea1ed5">
+  <!ENTITY samba3-md5sum        "fbb245863eeef2fffe172df779a217be">
   <!ENTITY samba3-size          "32.5 MB">
-  <!ENTITY samba3-buildsize     "460 MB">
-  <!ENTITY samba3-time          "2.2 SBU (add about 2.9 SBU to run the test suite)">
+  <!ENTITY samba3-buildsize     "472 MB">
+  <!ENTITY samba3-time          "2.4 SBU">
 ]>
 
 <sect1 id="samba3" xreflabel="Samba-&samba3-version;">
@@ -136,10 +136,13 @@
 sed -i "s/-ldl/&amp; -ltirpc -lpthread/" Makefile &amp;&amp;
 make</userinput></screen>
 
+<!--
     <para>To test the results, issue: <command>make test</command>. If you have
     <application>Linux-PAM</application> installed and built the PAM library
     modules, you can perform a dlopen test by issuing:
     <command>make test_pam_modules</command>.</para>
+-->
+    <para>This program dose not come with a functional test suite.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>