diff --git a/.gitignore b/.gitignore
index 79a00c0..2f572d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -89,3 +89,5 @@ samba-3.6.0pre1.tar.gz
 /samba-4.6.2.tar.asc
 /samba-4.6.3.tar.xz
 /samba-4.6.3.tar.asc
+/samba-4.6.4.tar.xz
+/samba-4.6.4.tar.asc
diff --git a/samba.spec b/samba.spec
index 2f51c3a..82c7277 100644
--- a/samba.spec
+++ b/samba.spec
@@ -8,7 +8,7 @@
 
 %define main_release 0
 
-%define samba_version 4.6.3
+%define samba_version 4.6.4
 %define talloc_version 2.1.9
 %define tdb_version 1.3.12
 %define tevent_version 0.9.31
@@ -2632,6 +2632,10 @@ rm -rf %{buildroot}
 %endif # with_clustering_support
 
 %changelog
+* Wed May 24 2017 Guenther Deschner <gdeschner@redhat.com> - 4.6.4-0
+- Update to Samba 4.6.4
+- resolves: #1455050 - Security fix for CVE-2017-7494
+
 * Tue Apr 25 2017 Guenther Deschner <gdeschner@redhat.com> - 4.6.3-0
 - Update to Samba 4.6.3
 
diff --git a/sources b/sources
index 5ea064c..528f897 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (samba-4.6.3.tar.xz) = f8ad8227cc59854dc2c482949d5581771628ec7e4582a896fba5a0bd278ed4e0193a5e5ab14bf2e93ac864e0dd5bd21e5e7c6a07f4dc0ca3d424f2d2fda5389b
-SHA512 (samba-4.6.3.tar.asc) = f83631ebead9c2a1674f34f08f0f6721c1eeafdb574f0e4b386fbec22714b3e371598f9b4a2331ddd37d10382d2e2469db8fd6e0380be7dacd8f5f82dd66bcf5
+SHA512 (samba-4.6.4.tar.xz) = 086c405801d3bcc77bffe391d561d4d12fd18816294731357c19ac8cf183c97691dbc87d1c52480ffc4c3de3b95c76507a75fb0a97b224c708676cdc76adb8d1
+SHA512 (samba-4.6.4.tar.asc) = d47a5f747699eeb981f1863361b97bee5e5f66d5e1f56b002358c27351218f9ecdbc44d1d63505f49f51f1e68eec62c86b5bbc3308d2d116243bcd05eefe8d10