diff --git a/build-source-timestamp b/build-source-timestamp
index 43cb9ba..29cc65b 100644
--- a/build-source-timestamp
+++ b/build-source-timestamp
@@ -1,2 +1,2 @@
-2854
+2859
 Branch      : 3.6.9
diff --git a/patches.tar.bz2 b/patches.tar.bz2
index a799b06..b9ba18d 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:15daa27b1e9ce9298207125340d336e722596eb679bd34873f8978e7f9e8ba3b
-size 44109
+oid sha256:17d73d7c2ddd14dcfc21f7bd646ff580f62ce243f0e822d4f1b8b6dce405f4df
+size 44163
diff --git a/samba-doc.spec b/samba-doc.spec
index 9c0a755..5c3f9e6 100644
--- a/samba-doc.spec
+++ b/samba-doc.spec
@@ -462,7 +462,7 @@ This package contains all the Samba documentation as it is not part of
 the man pages.
 
 
-Source Timestamp: 2854
+Source Timestamp: 2859
 Branch      : 3.6.9
 
 %changelog
diff --git a/samba.changes b/samba.changes
index bb0530f..2d1762d 100644
--- a/samba.changes
+++ b/samba.changes
@@ -66,7 +66,7 @@ Mon Oct 29 12:03:21 UTC 2012 - lmuelle@suse.com
 - Empty SPNEGO packet can cause smbd to crash; (bso#9174).
 - pam_winbind: Match more return codes when wbcGetPwnam has failed;
   (bso#9177).
-- Fix crash bug in idmap_hash; (bso#9188).
+- Fix crash bug in idmap_hash; (bso#9188); (bnc#788159).
 - SMB2 Create doesn't return correct MAX ACCESS access mask in blob;
   (bso#9189).
 - Fix service control for non-internal services; (bso#9192).
@@ -152,7 +152,7 @@ Thu Aug 16 14:18:35 UTC 2012 - lmuelle@suse.com
 Mon Aug  6 20:41:15 UTC 2012 - lmuelle@suse.com
 
 - Update to 3.6.7.
-  + Fix resolving our own "Domain Local" groups; (bso#9052).
+  + Fix resolving our own "Domain Local" groups; (bso#9052); (bnc#779269).
   + Fix migrating printers while upgrading from 3.5.x; (bso#9026).
 
 -------------------------------------------------------------------
@@ -172,7 +172,7 @@ Mon Aug  6 19:40:23 UTC 2012 - lmuelle@suse.com
   (bso#9034).
 - Using asynchronous IO with SMB2 can return NT_STATUS_FILE_CLOSED in error
   instead ofNT_STATUS_FILE_LOCK_CONFLICT; (bso#9040).
-- Fix resolving our own "Domain Local" groups; (bso#9052).
+- Fix resolving our own "Domain Local" groups; (bso#9052); (bnc#779269).
 - Fix build against CUPS 1.6; (bso#9055).
 - Fix bugs in SMB2 credit handling code; (bso#9057).
 - rpcclient: Fix bad call to data_blob_const; (bso#9062).
@@ -198,14 +198,14 @@ Mon Jun 25 19:46:31 UTC 2012 - lmuelle@suse.com
 - Update to 3.6.6.
   + Fix possible memory leaks in the Samba master process; (bso#8970).
   + Fix uninitialized memory read in talloc_free(); (bnc#764577).
-  + Fix joining of XP Pro workstations to 3.6 DCs; (bso#8373).
+  + Fix joining of XP Pro workstations to 3.6 DCs; (bso#8373); (bnc#787983).
 
 -------------------------------------------------------------------
 Thu Jun 21 18:05:33 UTC 2012 - lmuelle@suse.com
 
 - resolve_ads() code can return zero addresses and miss valid DC IP addresses;
   (bso#8910).
-- Can't join XP Pro workstations to 3.6.1 DC; (bso#8373).
+- Can't join XP Pro workstations to 3.6.1 DC; (bso#8373); (bnc#787983).
 - winbind can hang as nbt_getdc() has no timeout; (bso#8953).
 - Fix crash bug in dns_create_probe when dns_create_update fails; (bso#8627)
 - s3-pid: Catch with pid filename's change when config file is not smb.conf;
diff --git a/samba.spec b/samba.spec
index a3ae020..5f05a50 100644
--- a/samba.spec
+++ b/samba.spec
@@ -224,7 +224,7 @@ binary packages of the most current Samba version, and a bug reporting
 how to.
 
 
-Source Timestamp: 2854
+Source Timestamp: 2859
 Branch      : 3.6.9
 
 %package client
@@ -265,7 +265,7 @@ binary packages of the most current Samba version, and a bug reporting
 how to.
 
 
-Source Timestamp: 2854
+Source Timestamp: 2859
 Branch      : 3.6.9
 
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
@@ -285,7 +285,7 @@ This package contains the static libraries and header files needed to
 develop programs which make use of Samba.
 
 
-Source Timestamp: 2854
+Source Timestamp: 2859
 Branch      : 3.6.9
 
 %endif
@@ -310,7 +310,7 @@ This package contains all the Samba documentation as it is not part of
 the man pages.
 
 
-Source Timestamp: 2854
+Source Timestamp: 2859
 Branch      : 3.6.9
 
 %endif
@@ -331,7 +331,7 @@ Requires:       samba-client >= %{version}
 A wrapper binary to run smbspool with the original calling UID.
 
 
-Source Timestamp: 2854
+Source Timestamp: 2859
 Branch      : 3.6.9
 
 %if %{make_utils}
@@ -347,7 +347,7 @@ Obsoletes:      samba-gplv3-utils < %{version}
 Some of the debug-tools for developpers.
 
 
-Source Timestamp: 2854
+Source Timestamp: 2859
 Branch      : 3.6.9
 
 %endif
@@ -380,7 +380,7 @@ PreReq:         coreutils
 This is the winbind-daemon and the wbinfo-tool.
 
 
-Source Timestamp: 2854
+Source Timestamp: 2859
 Branch      : 3.6.9
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -406,14 +406,14 @@ PreReq:         /sbin/ldconfig
 
 %description -n libsmbclient
 
-Source Timestamp: 2854
+Source Timestamp: 2859
 Branch      : 3.6.9
 
 %else
 
 %description -n libsmbclient0
 
-Source Timestamp: 2854
+Source Timestamp: 2859
 Branch      : 3.6.9
 
 %endif
@@ -452,7 +452,7 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the smbclient programming interface.
 
 
-Source Timestamp: 2854
+Source Timestamp: 2859
 Branch      : 3.6.9
 
 %package -n libnetapi0
@@ -465,7 +465,7 @@ PreReq:         /sbin/ldconfig
 This package includes the netapi library.
 
 
-Source Timestamp: 2854
+Source Timestamp: 2859
 Branch      : 3.6.9
 
 %package -n libnetapi-devel
@@ -484,7 +484,7 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the netapi programming interface.
 
 
-Source Timestamp: 2854
+Source Timestamp: 2859
 Branch      : 3.6.9
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -505,14 +505,14 @@ PreReq:         /sbin/ldconfig
 
 %description -n libsmbsharemodes
 
-Source Timestamp: 2854
+Source Timestamp: 2859
 Branch      : 3.6.9
 
 %else
 
 %description -n libsmbsharemodes0
 
-Source Timestamp: 2854
+Source Timestamp: 2859
 Branch      : 3.6.9
 
 %endif
@@ -538,7 +538,7 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the smbsharemodes programming interface.
 
 
-Source Timestamp: 2854
+Source Timestamp: 2859
 Branch      : 3.6.9
 
 %package -n libwbclient0
@@ -551,7 +551,7 @@ PreReq:         /sbin/ldconfig
 This package includes the wbclient library.
 
 
-Source Timestamp: 2854
+Source Timestamp: 2859
 Branch      : 3.6.9
 
 %package -n libwbclient-devel
@@ -570,7 +570,7 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the wbclient programming interface.
 
 
-Source Timestamp: 2854
+Source Timestamp: 2859
 Branch      : 3.6.9
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1211
@@ -587,7 +587,7 @@ PreReq:         /sbin/ldconfig
 This package includes the talloc library.
 
 
-Source Timestamp: 2854
+Source Timestamp: 2859
 Branch      : 3.6.9
 
 %package -n libtalloc-devel
@@ -608,7 +608,7 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the talloc programming interface.
 
 
-Source Timestamp: 2854
+Source Timestamp: 2859
 Branch      : 3.6.9
 
 %package -n libtdb1
@@ -623,7 +623,7 @@ PreReq:         /sbin/ldconfig
 This package includes the tdb library.
 
 
-Source Timestamp: 2854
+Source Timestamp: 2859
 Branch      : 3.6.9
 
 %package -n libtdb-devel
@@ -640,7 +640,7 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the tdb programming interface.
 
 
-Source Timestamp: 2854
+Source Timestamp: 2859
 Branch      : 3.6.9
 
 %package -n libtevent0
@@ -655,7 +655,7 @@ PreReq:         /sbin/ldconfig
 This package includes the tevent library.
 
 
-Source Timestamp: 2854
+Source Timestamp: 2859
 Branch      : 3.6.9
 
 %package -n libtevent-devel
@@ -677,7 +677,7 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the tevent programming interface.
 
 
-Source Timestamp: 2854
+Source Timestamp: 2859
 Branch      : 3.6.9
 
 %package -n libldb1
@@ -693,7 +693,7 @@ PreReq:         /sbin/ldconfig
 This package includes the ldb library.
 
 
-Source Timestamp: 2854
+Source Timestamp: 2859
 Branch      : 3.6.9
 
 %package -n libldb-devel
@@ -714,7 +714,7 @@ Requires:       libtalloc-devel
 This package contains the static libraries and header files needed to
 develop programs which make use of the tevent programming interface.
 
-Source Timestamp: 2854
+Source Timestamp: 2859
 Branch      : 3.6.9
 
 %endif
@@ -734,7 +734,7 @@ This tool aims to simplify the administration of a Samba Domain
 Controller that uses the ldapsam passdb backend.
 
 
-Source Timestamp: 2854
+Source Timestamp: 2859
 Branch      : 3.6.9
 
 %endif
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 494c365..fc7528e 100644
--- a/vendor-files.tar.bz2
+++ b/vendor-files.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b105f85e801a15e9232b6d9e38d1b9f113564cf8769be6cae8928d380e8d4c6f
-size 53421
+oid sha256:5cb085c5f42add160e2307bbd845681de9d20a6bcf535734233f0cb512dd793c
+size 53432