diff --git a/.gitignore b/.gitignore
index 977edb3..f4f3965 100644
--- a/.gitignore
+++ b/.gitignore
@@ -119,3 +119,5 @@ samba-3.6.0pre1.tar.gz
 /samba-4.8.0rc3.tar.asc
 /samba-4.8.0rc4.tar.xz
 /samba-4.8.0rc4.tar.asc
+/samba-4.8.0.tar.xz
+/samba-4.8.0.tar.asc
diff --git a/samba.spec b/samba.spec
index bb93e13..c3f75d7 100644
--- a/samba.spec
+++ b/samba.spec
@@ -6,7 +6,7 @@
 # ctdb is enabled by default, you can disable it with: --without clustering
 %bcond_without clustering
 
-%define main_release 6
+%define main_release 7
 
 %define samba_version 4.8.0
 %define talloc_version 2.1.11
@@ -14,7 +14,7 @@
 %define tevent_version 0.9.36
 %define ldb_version 1.3.2
 # This should be rc1 or nil
-%define pre_release rc4
+%define pre_release %nil
 
 %if "x%{?pre_release}" != "x"
 %define samba_release 0.%{main_release}.%{pre_release}%{?dist}
@@ -3552,6 +3552,10 @@ fi
 %endif # with_clustering_support
 
 %changelog
+* Wed Mar 14 2018 Guenther Deschner <gdeschner@redhat.com> - 4.8.0-7
+- resolves: #1554754, #1554756 - Security fixes for CVE-2018-1050 CVE-2018-1057
+- resolves: #1555112 - Update to Samba 4.8.0
+
 * Tue Mar 13 2018 Andreas Schneider <asn@redhat.com> - 4.8.0rc4-6
 - resolves: #1552652 - Fix usage of nc in ctdb tests and only recommned it
 
diff --git a/sources b/sources
index a247e0c..e08040e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (samba-4.8.0rc4.tar.xz) = c4116a3997b874f94b31faae75f543f36d2ae44a9638acb5e8e3b757160ec8cacecc4c1db67c5aa8fc61da2989b05ca1ddfb335d4886ce22cf82d90c1bb4c58a
-SHA512 (samba-4.8.0rc4.tar.asc) = 74bcb2c37330be53ad5ad83017b3f548afdebc7ecefbc38944b117776b11968d816a339b7840ba2b54d13fc3ef832faf3dd435f76e6293cc7a83204ba497f5d1
+SHA512 (samba-4.8.0.tar.xz) = aec402cf929d1cda67d552aff0e64dfb507c2c715ae8ff5a78fa2d19ba27cbf1ca984b00cb33045e4f26506bdebaa629e126b3d61d7825bf0458c5a4310cc738
+SHA512 (samba-4.8.0.tar.asc) = 716f54983773dd595cd8d672ef23281170930f72e115443d083ebdcc022a63dc783239b4293eb4f57b943cb88f02e41c02f5e4d39dedffd4a0a0e5ed879f4040