diff --git a/.gitignore b/.gitignore
index bab3020..908e3f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,3 +78,4 @@ samba-3.6.0pre1.tar.gz
 /samba-4.5.5.tar.xz
 /samba-4.5.6.tar.xz
 /samba-4.5.7.tar.xz
+/samba-4.5.8.tar.xz
diff --git a/samba.spec b/samba.spec
index 551adc3..f003480 100644
--- a/samba.spec
+++ b/samba.spec
@@ -8,7 +8,7 @@
 
 %define main_release 0
 
-%define samba_version 4.5.7
+%define samba_version 4.5.8
 %define talloc_version 2.1.8
 %define tdb_version 1.3.10
 %define tevent_version 0.9.29
@@ -2550,6 +2550,11 @@ rm -rf %{buildroot}
 %endif # with_clustering_support
 
 %changelog
+* Fri Mar 31 2017 Guenther Deschner <gdeschner@redhat.com> - 4.5.8-0
+- Update to Samba 4.5.8
+- related: #1435156 - Security fix for CVE-2017-2619
+- resolves: #1436145
+
 * Thu Mar 23 2017 Guenther Deschner <gdeschner@redhat.com> - 4.5.7-0
 - Update to Samba 4.5.7
 - resolves: #1435156 - Security fix for CVE-2017-2619
diff --git a/sources b/sources
index 64cc7b6..9d696da 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (samba-4.5.7.tar.xz) = c37895d665edbe1c6c5163e44b06dc358c913b7ac2f15ffdf91d578325471ee2a4061e0bb0b28b51d782a9216ca7ac9b2890252fe67d03dfa776f52047b8dd47
+SHA512 (samba-4.5.8.tar.xz) = 605d50b83ddeb4ba5a5330374656b872ff34c1e6402d4e9c00d15a082bb344bc690d92e2a8aca0fca72360da89c4a00cdca1b288815f5b923981c24391706ffe