diff --git a/.gitignore b/.gitignore
index a45c813..760e966 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ samba-3.6.0pre1.tar.gz
 /samba-3.6.0.tar.gz
 /samba-3.6.1.tar.gz
 /samba-3.6.3.tar.gz
+/samba-3.6.4.tar.gz
diff --git a/samba.spec b/samba.spec
index aa35054..320307a 100644
--- a/samba.spec
+++ b/samba.spec
@@ -1,5 +1,5 @@
-%define main_release 81
-%define samba_version 3.6.3
+%define main_release 82
+%define samba_version 3.6.4
 %define tdb_version 1.2.9
 %define talloc_version 2.0.5
 #%define pre_release rc3
@@ -688,6 +688,10 @@ fi
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Thu Apr 12 2012 Jon Ciesla <limburgher@gmail.com> - 1:3.6.4-82
+- Update to 3.6.4
+- Fixes CVE-2012-1182
+
 * Mon Mar 19 2012 Andreas Schneider <asn@redhat.com> - 1:3.6.3-81
 - Fix provides for of libwclient-devel for samba-winbind-devel.
 
diff --git a/sources b/sources
index 8f45366..2a6e460 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-98ac9db9f4b6ebfc3f013aa193ffb0d1  samba-3.6.3.tar.gz
+d8e070e2a3b12f202f347e4427469bc2  samba-3.6.4.tar.gz