diff --git a/build-source-timestamp b/build-source-timestamp
index 49c3660..294441b 100644
--- a/build-source-timestamp
+++ b/build-source-timestamp
@@ -1,2 +1,2 @@
-2797
-Branch      : 3.6.4.PTF
+2798
+Branch      : 3.6.5.PTF
diff --git a/patches.tar.bz2 b/patches.tar.bz2
index ebc73e5..62dc059 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:05762e61d05328c5f06911bbc5caeaf970f855ed822884660e8bb483f67a3a46
-size 54108
+oid sha256:69e6748aecc26b93e4518843a20136491669ade44337ccb1e6059b7f193d334b
+size 53552
diff --git a/samba-3.6.4.tar.bz2 b/samba-3.6.4.tar.bz2
deleted file mode 100644
index 130b1af..0000000
--- a/samba-3.6.4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f51904d52afb47253863673c78a251b5105301611311baac003f1f845e6b1941
-size 24464368
diff --git a/samba-3.6.5.tar.bz2 b/samba-3.6.5.tar.bz2
new file mode 100644
index 0000000..8f26127
--- /dev/null
+++ b/samba-3.6.5.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0d6020ad32aaa16c01c4dabc8518ca56c1420e9e4929cb9259e7938be2540369
+size 24464640
diff --git a/samba-doc.spec b/samba-doc.spec
index fba3003..932b581 100644
--- a/samba-doc.spec
+++ b/samba-doc.spec
@@ -82,7 +82,7 @@ BuildRequires:  pkg-config
 %else
 BuildRequires:  pkgconfig
 %endif
-%define	samba_ver 3.6.4
+%define	samba_ver 3.6.5
 %define	samba_ver_suffix %nil
 %define	samba_ver_full %{samba_ver}%{samba_ver_suffix}
 %if 0%{?suse_version} && 0%{?suse_version} < 1111
@@ -104,7 +104,7 @@ BuildRequires:  pkgconfig
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-Version:        3.6.4
+Version:        3.6.5
 Release:        1
 %define	ldapsmb_ver 1.34b
 Url:            http://www.samba.org/
@@ -451,7 +451,7 @@ This package contains all the Samba documentation as it is not part of
 the man pages.
 
 
-Source Timestamp: 2797
-Branch      : 3.6.4.PTF
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %changelog
diff --git a/samba.changes b/samba.changes
index 6610595..d03d391 100644
--- a/samba.changes
+++ b/samba.changes
@@ -10,6 +10,7 @@ Sat Apr 21 20:59:53 UTC 2012 - lmuelle@suse.com
 -------------------------------------------------------------------
 Fri Apr 20 09:51:25 UTC 2012 - lmuelle@suse.com
 
+- Update to 3.6.5.
 - Restrict self granting privileges where security=ads for Samba post-3.3.16;
   CVE-2012-2111; (bnc#757576).
 
diff --git a/samba.spec b/samba.spec
index 0d5a4f3..96e0840 100644
--- a/samba.spec
+++ b/samba.spec
@@ -82,7 +82,7 @@ BuildRequires:  pkg-config
 %else
 BuildRequires:  pkgconfig
 %endif
-%define	samba_ver 3.6.4
+%define	samba_ver 3.6.5
 %define	samba_ver_suffix %nil
 %define	samba_ver_full %{samba_ver}%{samba_ver_suffix}
 %if 0%{?suse_version} && 0%{?suse_version} < 1111
@@ -104,7 +104,7 @@ BuildRequires:  pkgconfig
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-Version:        3.6.4
+Version:        3.6.5
 Release:        1
 %define	ldapsmb_ver 1.34b
 License:        GPL-3.0+
@@ -211,8 +211,8 @@ binary packages of the most current Samba version, and a bug reporting
 how to.
 
 
-Source Timestamp: 2797
-Branch      : 3.6.4.PTF
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %package client
 License:        GPL-3.0+
@@ -252,8 +252,8 @@ binary packages of the most current Samba version, and a bug reporting
 how to.
 
 
-Source Timestamp: 2797
-Branch      : 3.6.4.PTF
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
 
@@ -272,8 +272,8 @@ This package contains the static libraries and header files needed to
 develop programs which make use of Samba.
 
 
-Source Timestamp: 2797
-Branch      : 3.6.4.PTF
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %endif
 %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110
@@ -297,8 +297,8 @@ This package contains all the Samba documentation as it is not part of
 the man pages.
 
 
-Source Timestamp: 2797
-Branch      : 3.6.4.PTF
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %endif
 
@@ -319,8 +319,8 @@ Requires:       samba-client >= %{version}
 A wrapper binary to run smbspool with the original calling UID.
 
 
-Source Timestamp: 2797
-Branch      : 3.6.4.PTF
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %if %{make_utils}
 
@@ -335,8 +335,8 @@ Obsoletes:      samba-gplv3-utils < %{version}
 Some of the debug-tools for developpers.
 
 
-Source Timestamp: 2797
-Branch      : 3.6.4.PTF
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %endif
 
@@ -367,8 +367,8 @@ PreReq:         coreutils
 This is the winbind-daemon and the wbinfo-tool.
 
 
-Source Timestamp: 2797
-Branch      : 3.6.4.PTF
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
 
@@ -393,15 +393,15 @@ PreReq:         /sbin/ldconfig
 
 %description -n libsmbclient
 
-Source Timestamp: 2797
-Branch      : 3.6.4.PTF
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %else
 
 %description -n libsmbclient0
 
-Source Timestamp: 2797
-Branch      : 3.6.4.PTF
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %endif
 This package includes the libsmbclient library.
@@ -439,8 +439,8 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the smbclient programming interface.
 
 
-Source Timestamp: 2797
-Branch      : 3.6.4.PTF
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %package -n libnetapi0
 License:        GPL-3.0+
@@ -452,8 +452,8 @@ PreReq:         /sbin/ldconfig
 This package includes the netapi library.
 
 
-Source Timestamp: 2797
-Branch      : 3.6.4.PTF
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %package -n libnetapi-devel
 License:        GPL-3.0+
@@ -471,8 +471,8 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the netapi programming interface.
 
 
-Source Timestamp: 2797
-Branch      : 3.6.4.PTF
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
 
@@ -492,15 +492,15 @@ PreReq:         /sbin/ldconfig
 
 %description -n libsmbsharemodes
 
-Source Timestamp: 2797
-Branch      : 3.6.4.PTF
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %else
 
 %description -n libsmbsharemodes0
 
-Source Timestamp: 2797
-Branch      : 3.6.4.PTF
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %endif
 This package includes the smbsharemodes library.
@@ -525,8 +525,8 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the smbsharemodes programming interface.
 
 
-Source Timestamp: 2797
-Branch      : 3.6.4.PTF
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %package -n libwbclient0
 License:        LGPL-3.0+
@@ -538,8 +538,8 @@ PreReq:         /sbin/ldconfig
 This package includes the wbclient library.
 
 
-Source Timestamp: 2797
-Branch      : 3.6.4.PTF
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %package -n libwbclient-devel
 License:        LGPL-3.0+
@@ -557,8 +557,8 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the wbclient programming interface.
 
 
-Source Timestamp: 2797
-Branch      : 3.6.4.PTF
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %package -n libtalloc2
 Version:        %{libtalloc_ver}
@@ -572,8 +572,8 @@ PreReq:         /sbin/ldconfig
 This package includes the talloc library.
 
 
-Source Timestamp: 2797
-Branch      : 3.6.4.PTF
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %package -n libtalloc-devel
 Version:        %{libtalloc_ver}
@@ -593,8 +593,8 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the talloc programming interface.
 
 
-Source Timestamp: 2797
-Branch      : 3.6.4.PTF
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %package -n libtdb1
 Version:        %{libtdb_ver}
@@ -608,8 +608,8 @@ PreReq:         /sbin/ldconfig
 This package includes the tdb library.
 
 
-Source Timestamp: 2797
-Branch      : 3.6.4.PTF
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %package -n libtdb-devel
 Version:        %{libtdb_ver}
@@ -625,8 +625,8 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the tdb programming interface.
 
 
-Source Timestamp: 2797
-Branch      : 3.6.4.PTF
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %package -n libtevent0
 Version:        %{libtevent_ver}
@@ -640,8 +640,8 @@ PreReq:         /sbin/ldconfig
 This package includes the tevent library.
 
 
-Source Timestamp: 2797
-Branch      : 3.6.4.PTF
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %package -n libtevent-devel
 Version:        %{libtevent_ver}
@@ -662,8 +662,8 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the tevent programming interface.
 
 
-Source Timestamp: 2797
-Branch      : 3.6.4.PTF
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %package -n libldb1
 Version:        %{libldb_ver}
@@ -678,8 +678,8 @@ PreReq:         /sbin/ldconfig
 This package includes the ldb library.
 
 
-Source Timestamp: 2797
-Branch      : 3.6.4.PTF
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %package -n libldb-devel
 Version:        %{libldb_ver}
@@ -700,8 +700,8 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the tevent programming interface.
 
 
-Source Timestamp: 2797
-Branch      : 3.6.4.PTF
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %if %{make_ldapsmb}
 
@@ -718,8 +718,8 @@ This tool aims to simplify the administration of a Samba Domain
 Controller that uses the ldapsam passdb backend.
 
 
-Source Timestamp: 2797
-Branch      : 3.6.4.PTF
+Source Timestamp: 2798
+Branch      : 3.6.5.PTF
 
 %endif
 
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 0e5b330..cdd7b36 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:6af849f3b0160106c9be2e093dc4f12051d95b08cee4b4a40bc2846bf2993d56
-size 52538
+oid sha256:94f5c263bc2a4d549a03c7cc638e785847d2a7877fc6370183de61881d6ca0a1
+size 52524