diff --git a/build-source-timestamp b/build-source-timestamp
index 7ae1362..0e741cf 100644
--- a/build-source-timestamp
+++ b/build-source-timestamp
@@ -1,2 +1,2 @@
-2809
-Branch      : 3.6.5.PTF
+2814
+Branch      : 3.6.5
diff --git a/patches.tar.bz2 b/patches.tar.bz2
index ce80ca8..7455a20 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3a734a1d3293ad44db285d112d883411d0319b690ae12d339304be90c952d977
-size 86289
+oid sha256:8f6bae14396be9acc293009756db688342252f9ee9afae970d11cdf678d49508
+size 105526
diff --git a/samba-doc.spec b/samba-doc.spec
index 8c3a63d..5bb22e3 100644
--- a/samba-doc.spec
+++ b/samba-doc.spec
@@ -289,7 +289,7 @@ pushd source3
 %endif
 # Ensure all idl is recompiled, in case we are carrying pidl changes locally.
 rm -f librpc/gen_ndr/*.[cho] ../librpc/gen_ndr/*.[cho]
-%if 0%{?centos_version} > 599 || 0%{?fedora_version} > 11 && 0%{?fedora_version} < 15 || 0%{?mandriva_version} > 2009 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 0 && 0%{?suse_version} < 1211
+%if 0%{?centos_version} > 599 || 0%{?fedora_version} > 11 && 0%{?fedora_version} < 15 || 0%{?mandriva_version} > 2009 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 0
 ./autogen.sh
 %endif
 CONFIGURE_OPTIONS="\
@@ -459,7 +459,7 @@ This package contains all the Samba documentation as it is not part of
 the man pages.
 
 
-Source Timestamp: 2809
-Branch      : 3.6.5.PTF
+Source Timestamp: 2814
+Branch      : 3.6.5
 
 %changelog
diff --git a/samba.changes b/samba.changes
index 59f6e95..7743408 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,7 +1,33 @@
+-------------------------------------------------------------------
+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).
+- 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;
+  (bso#8714).
+- Possible memory leaks in the main Samba process; (bso#8970).
+- s3: Fix uninitialized memory read in talloc_free(); (bnc#764577).
+- Treat exit_server_cleanly() as a "clean" shutdown; (bso#8971).
+- Avoid crash with MIT krb5 1.10.0 in gss_get_name_attribute(); (bso#8988).
+- Winzip occasionally can not read files out of an open winzip dialog;
+  (bso#8311).
+- s3-winbindd: call dump_core_setup after command line option has been parsed;
+  (bso#8975).
+- Directory group write permission bit is set if unix extensions are enabled;
+  (bso#8972).
+- s3: remove dependency on automake for "make everything"; (bso#8978).
+- sd_has_inheritable_components segfaults on an SD that se_access_check
+  accepts; (bso#8811).
+- smbclient's tarmode insists on listing excluded directories; (bso#8922).
+- Notify code can miss a ChDir; (bso#8998).
+- s3:smbd: add a fsp_persistent_id() function; (bso#8995).
+
 -------------------------------------------------------------------
 Fri Jun  1 23:01:11 UTC 2012 - lmuelle@suse.com
 
-- Don't call autogen.sh on post-12.1 SUSE and post-14 Fedora systems.
 - Recompile all IDL in any case.
 
 -------------------------------------------------------------------
diff --git a/samba.spec b/samba.spec
index b58711c..d927bec 100644
--- a/samba.spec
+++ b/samba.spec
@@ -221,8 +221,8 @@ binary packages of the most current Samba version, and a bug reporting
 how to.
 
 
-Source Timestamp: 2809
-Branch      : 3.6.5.PTF
+Source Timestamp: 2814
+Branch      : 3.6.5
 
 %package client
 License:        GPL-3.0+
@@ -262,8 +262,8 @@ binary packages of the most current Samba version, and a bug reporting
 how to.
 
 
-Source Timestamp: 2809
-Branch      : 3.6.5.PTF
+Source Timestamp: 2814
+Branch      : 3.6.5
 
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
 
@@ -282,8 +282,8 @@ This package contains the static libraries and header files needed to
 develop programs which make use of Samba.
 
 
-Source Timestamp: 2809
-Branch      : 3.6.5.PTF
+Source Timestamp: 2814
+Branch      : 3.6.5
 
 %endif
 %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110
@@ -307,8 +307,8 @@ This package contains all the Samba documentation as it is not part of
 the man pages.
 
 
-Source Timestamp: 2809
-Branch      : 3.6.5.PTF
+Source Timestamp: 2814
+Branch      : 3.6.5
 
 %endif
 
@@ -329,8 +329,8 @@ Requires:       samba-client >= %{version}
 A wrapper binary to run smbspool with the original calling UID.
 
 
-Source Timestamp: 2809
-Branch      : 3.6.5.PTF
+Source Timestamp: 2814
+Branch      : 3.6.5
 
 %if %{make_utils}
 
@@ -345,8 +345,8 @@ Obsoletes:      samba-gplv3-utils < %{version}
 Some of the debug-tools for developpers.
 
 
-Source Timestamp: 2809
-Branch      : 3.6.5.PTF
+Source Timestamp: 2814
+Branch      : 3.6.5
 
 %endif
 
@@ -378,8 +378,8 @@ PreReq:         coreutils
 This is the winbind-daemon and the wbinfo-tool.
 
 
-Source Timestamp: 2809
-Branch      : 3.6.5.PTF
+Source Timestamp: 2814
+Branch      : 3.6.5
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
 
@@ -404,15 +404,15 @@ PreReq:         /sbin/ldconfig
 
 %description -n libsmbclient
 
-Source Timestamp: 2809
-Branch      : 3.6.5.PTF
+Source Timestamp: 2814
+Branch      : 3.6.5
 
 %else
 
 %description -n libsmbclient0
 
-Source Timestamp: 2809
-Branch      : 3.6.5.PTF
+Source Timestamp: 2814
+Branch      : 3.6.5
 
 %endif
 This package includes the libsmbclient library.
@@ -450,8 +450,8 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the smbclient programming interface.
 
 
-Source Timestamp: 2809
-Branch      : 3.6.5.PTF
+Source Timestamp: 2814
+Branch      : 3.6.5
 
 %package -n libnetapi0
 License:        GPL-3.0+
@@ -463,8 +463,8 @@ PreReq:         /sbin/ldconfig
 This package includes the netapi library.
 
 
-Source Timestamp: 2809
-Branch      : 3.6.5.PTF
+Source Timestamp: 2814
+Branch      : 3.6.5
 
 %package -n libnetapi-devel
 License:        GPL-3.0+
@@ -482,8 +482,8 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the netapi programming interface.
 
 
-Source Timestamp: 2809
-Branch      : 3.6.5.PTF
+Source Timestamp: 2814
+Branch      : 3.6.5
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
 
@@ -503,15 +503,15 @@ PreReq:         /sbin/ldconfig
 
 %description -n libsmbsharemodes
 
-Source Timestamp: 2809
-Branch      : 3.6.5.PTF
+Source Timestamp: 2814
+Branch      : 3.6.5
 
 %else
 
 %description -n libsmbsharemodes0
 
-Source Timestamp: 2809
-Branch      : 3.6.5.PTF
+Source Timestamp: 2814
+Branch      : 3.6.5
 
 %endif
 This package includes the smbsharemodes library.
@@ -536,8 +536,8 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the smbsharemodes programming interface.
 
 
-Source Timestamp: 2809
-Branch      : 3.6.5.PTF
+Source Timestamp: 2814
+Branch      : 3.6.5
 
 %package -n libwbclient0
 License:        LGPL-3.0+
@@ -549,8 +549,8 @@ PreReq:         /sbin/ldconfig
 This package includes the wbclient library.
 
 
-Source Timestamp: 2809
-Branch      : 3.6.5.PTF
+Source Timestamp: 2814
+Branch      : 3.6.5
 
 %package -n libwbclient-devel
 License:        LGPL-3.0+
@@ -568,8 +568,8 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the wbclient programming interface.
 
 
-Source Timestamp: 2809
-Branch      : 3.6.5.PTF
+Source Timestamp: 2814
+Branch      : 3.6.5
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1211
 
@@ -585,8 +585,8 @@ PreReq:         /sbin/ldconfig
 This package includes the talloc library.
 
 
-Source Timestamp: 2809
-Branch      : 3.6.5.PTF
+Source Timestamp: 2814
+Branch      : 3.6.5
 
 %package -n libtalloc-devel
 Version:        %{libtalloc_ver}
@@ -606,8 +606,8 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the talloc programming interface.
 
 
-Source Timestamp: 2809
-Branch      : 3.6.5.PTF
+Source Timestamp: 2814
+Branch      : 3.6.5
 
 %package -n libtdb1
 Version:        %{libtdb_ver}
@@ -621,8 +621,8 @@ PreReq:         /sbin/ldconfig
 This package includes the tdb library.
 
 
-Source Timestamp: 2809
-Branch      : 3.6.5.PTF
+Source Timestamp: 2814
+Branch      : 3.6.5
 
 %package -n libtdb-devel
 Version:        %{libtdb_ver}
@@ -638,8 +638,8 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the tdb programming interface.
 
 
-Source Timestamp: 2809
-Branch      : 3.6.5.PTF
+Source Timestamp: 2814
+Branch      : 3.6.5
 
 %package -n libtevent0
 Version:        %{libtevent_ver}
@@ -653,8 +653,8 @@ PreReq:         /sbin/ldconfig
 This package includes the tevent library.
 
 
-Source Timestamp: 2809
-Branch      : 3.6.5.PTF
+Source Timestamp: 2814
+Branch      : 3.6.5
 
 %package -n libtevent-devel
 Version:        %{libtevent_ver}
@@ -675,8 +675,8 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the tevent programming interface.
 
 
-Source Timestamp: 2809
-Branch      : 3.6.5.PTF
+Source Timestamp: 2814
+Branch      : 3.6.5
 
 %package -n libldb1
 Version:        %{libldb_ver}
@@ -691,8 +691,8 @@ PreReq:         /sbin/ldconfig
 This package includes the ldb library.
 
 
-Source Timestamp: 2809
-Branch      : 3.6.5.PTF
+Source Timestamp: 2814
+Branch      : 3.6.5
 
 %package -n libldb-devel
 Version:        %{libldb_ver}
@@ -712,8 +712,8 @@ 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: 2809
-Branch      : 3.6.5.PTF
+Source Timestamp: 2814
+Branch      : 3.6.5
 
 %endif
 
@@ -732,8 +732,8 @@ This tool aims to simplify the administration of a Samba Domain
 Controller that uses the ldapsam passdb backend.
 
 
-Source Timestamp: 2809
-Branch      : 3.6.5.PTF
+Source Timestamp: 2814
+Branch      : 3.6.5
 
 %endif
 
@@ -835,7 +835,7 @@ pushd source3
 %endif
 # Ensure all idl is recompiled, in case we are carrying pidl changes locally.
 rm -f librpc/gen_ndr/*.[cho] ../librpc/gen_ndr/*.[cho]
-%if 0%{?centos_version} > 599 || 0%{?fedora_version} > 11 && 0%{?fedora_version} < 15 || 0%{?mandriva_version} > 2009 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 0 && 0%{?suse_version} < 1211
+%if 0%{?centos_version} > 599 || 0%{?fedora_version} > 11 && 0%{?fedora_version} < 15 || 0%{?mandriva_version} > 2009 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 0
 ./autogen.sh
 %endif
 CONFIGURE_OPTIONS="\
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 8fd7131..fc617e8 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:e576b416ef26c24de6c601ed89928458973b5421671553dad684a0e8f85ba014
-size 52554
+oid sha256:099a3fbf61c70845e57957b77c6ccb0d2f782b79564287b20e3da790161bc589
+size 52490