diff --git a/.gitignore b/.gitignore
index d1ca2ab..497b561 100644
--- a/.gitignore
+++ b/.gitignore
@@ -127,3 +127,5 @@ samba-3.6.0pre1.tar.gz
 /samba-4.8.2.tar.asc
 /samba-4.8.3.tar.asc
 /samba-4.8.3.tar.xz
+/samba-4.8.4.tar.xz
+/samba-4.8.4.tar.asc
diff --git a/samba.spec b/samba.spec
index 70d6201..a17684e 100644
--- a/samba.spec
+++ b/samba.spec
@@ -6,9 +6,9 @@
 # ctdb is enabled by default, you can disable it with: --without clustering
 %bcond_without clustering
 
-%define main_release 2
+%define main_release 0
 
-%define samba_version 4.8.3
+%define samba_version 4.8.4
 %define talloc_version 2.1.11
 %define tdb_version 1.3.15
 %define tevent_version 0.9.36
@@ -3553,6 +3553,9 @@ fi
 %endif # with_clustering_support
 
 %changelog
+* Wed Aug 15 2018 Guenther Deschner <gdeschner@redhat.com> - 4.8.4-0
+- Update to Samba 4.8.4
+
 * Tue Jul 24 2018 Alexander Bokovoy <abokovoy@redhat.com> - 4.8.3-2
 - Rebuild samba against a downgraded libldb version
 - Fixes: #1601944
diff --git a/sources b/sources
index 4a33842..eb49a79 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (samba-4.8.3.tar.asc) = bd56dd9e811b91abc98e0b7e09960a3fd4a988b3481af88193573b2582db035c46f5a8c803f8ffbcc4b6c85050e0b021e549512b807dcf6086e0322de8e920c5
-SHA512 (samba-4.8.3.tar.xz) = 0df56bebf00e2a3b54e5012d0888a637c1ff5d10f47907b15162cc786f6a2a4d77f78aa142c7ab532536110c0aee14ff662f0f23fe2e24bf3cfb169325c5a249
+SHA512 (samba-4.8.4.tar.xz) = e7c9e6b7ad0569572a228842703f6e57b6d78a0a9382a1ab011b7f67a96baa21c834945b0acb7e14feb6be0c853dbab8f13e53cb3de83904c09b2852d054b84e
+SHA512 (samba-4.8.4.tar.asc) = 2804c89598b2901332d6c4f58c14723e831eac610f764dfd434e3470a9ecafeba0e10d24d3243ba751f61b74be3f78dd63e9d76c99249f5f49f36addd08c402d