diff --git a/.gitignore b/.gitignore
index 760e966..c7b6858 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ samba-3.6.0pre1.tar.gz
 /samba-3.6.1.tar.gz
 /samba-3.6.3.tar.gz
 /samba-3.6.4.tar.gz
+/samba-3.6.5.tar.gz
diff --git a/samba.spec b/samba.spec
index bbd55d0..54dc089 100644
--- a/samba.spec
+++ b/samba.spec
@@ -1,5 +1,5 @@
-%define main_release 84
-%define samba_version 3.6.4
+%define main_release 85
+%define samba_version 3.6.5
 %define tdb_version 1.2.9
 %define talloc_version 2.0.5
 #%define pre_release rc3
@@ -695,6 +695,10 @@ fi
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Mon Apr 30 2012 Guenther Deschner <gdeschner@redhat.com> - 1:3.6.5-85
+- Security Release, fixes CVE-2012-2111
+- resolves: #XXXXX
+
 * Mon Apr 23 2012 Andreas Schneider <asn@redhat.com> - 1:3.6.4-84
 - Fix creation of /var/run/samba.
 - resolves: #751625
diff --git a/sources b/sources
index 2a6e460..9ad719d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d8e070e2a3b12f202f347e4427469bc2  samba-3.6.4.tar.gz
+2f0c14547333c1b48fd4728b031e7040  samba-3.6.5.tar.gz