diff --git a/.gitignore b/.gitignore
index bc3b568..50d614c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/samba-4.18.3.tar.xz
-SOURCES/samba-4.18.3.tar.asc
+SOURCES/samba-4.18.4.tar.xz
+SOURCES/samba-4.18.4.tar.asc
diff --git a/.samba.metadata b/.samba.metadata
index 08d7447..cf75d17 100644
--- a/.samba.metadata
+++ b/.samba.metadata
@@ -1,2 +1,2 @@
-1d8d4e8fdda39026854fbbd5dc82f1c2af1a265f  SOURCES/samba-4.18.3.tar.xz
-39e5888c0d985ffaae116cc971d54d3bdc9ef0c7  SOURCES/samba-4.18.3.tar.asc
+f75df9085df2edf237fbc1b27751bbb281a69e97  SOURCES/samba-4.18.4.tar.xz
+f3342ebb0a1df52a7c5763865688e840cf471c36  SOURCES/samba-4.18.4.tar.asc
diff --git a/SPECS/samba.spec b/SPECS/samba.spec
index 9e5dd84..92379c6 100644
--- a/SPECS/samba.spec
+++ b/SPECS/samba.spec
@@ -87,9 +87,9 @@
 
 %define samba_requires_eq()  %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
 
-%global baserelease 101
+%global baserelease 100
 
-%global samba_version 4.18.3
+%global samba_version 4.18.4
 # This should be rc1 or nil
 %define pre_release %nil
 
@@ -4297,6 +4297,9 @@ fi
 %endif
 
 %changelog
+* Fri Jul 07 2023 - Anoop C S <anoopcs@samba.org> - 4.18.4-100
+- v4.18.4 GA
+
 * Mon Jun 12 2023 - Anoop C S <anoopcs@samba.org> - 4.18.3-101
 - Rebuild with updated GlusterFS API dependency