diff --git a/.gitignore b/.gitignore
index 335ab99..9869c96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/samba-4.18.7.tar.xz
-SOURCES/samba-4.18.7.tar.asc
+SOURCES/samba-4.18.8.tar.xz
+SOURCES/samba-4.18.8.tar.asc
diff --git a/.samba.metadata b/.samba.metadata
index 9bf6870..ac76a2c 100644
--- a/.samba.metadata
+++ b/.samba.metadata
@@ -1,2 +1,2 @@
-2e62df652e569adc87f1c56795e6083d9c6b62d5  SOURCES/samba-4.18.7.tar.xz
-91183539a35f358805236d7d6f5dbc913c7a50f4  SOURCES/samba-4.18.7.tar.asc
+520cc182a6057b73f2785a1f821204ade0ac5244  SOURCES/samba-4.18.8.tar.xz
+99923b9754b571c38d259eef6764fc0a105b2fe8  SOURCES/samba-4.18.8.tar.asc
diff --git a/SPECS/samba.spec b/SPECS/samba.spec
index 4d50c02..5967783 100644
--- a/SPECS/samba.spec
+++ b/SPECS/samba.spec
@@ -89,7 +89,7 @@
 
 %global baserelease 100
 
-%global samba_version 4.18.7
+%global samba_version 4.18.8
 # This should be rc1 or nil
 %define pre_release %nil
 
@@ -2133,7 +2133,9 @@ fi
 %{_libexecdir}/samba/rpcd_fsrvp
 %{_libexecdir}/samba/rpcd_lsad
 %{_libexecdir}/samba/rpcd_mdssvc
+%if %{with testsuite}
 %{_libexecdir}/samba/rpcd_rpcecho
+%endif
 %{_libexecdir}/samba/rpcd_spoolss
 %{_libexecdir}/samba/rpcd_winreg
 %{_libexecdir}/samba/samba-dcerpcd
@@ -4297,6 +4299,9 @@ fi
 %endif
 
 %changelog
+* Thu Oct 12 2023 - Anoop C S <anoopcs@samba.org> - 4.18.8-100
+- v4.18.8 GA
+
 * Tue Oct 03 2023 - Anoop C S <anoopcs@samba.org> - 4.18.7-100
 - v4.18.7 GA