diff --git a/.gitignore b/.gitignore
index 7d284fe..6cbb4d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,5 @@ SOURCES/samba-4.15.6.tar.xz
 SOURCES/samba-4.15.6.tar.asc
 SOURCES/samba-4.15.7.tar.xz
 SOURCES/samba-4.15.7.tar.asc
+SOURCES/samba-4.15.8.tar.xz
+SOURCES/samba-4.15.8.tar.asc
diff --git a/.samba.metadata b/.samba.metadata
index 1c13b56..f20799d 100644
--- a/.samba.metadata
+++ b/.samba.metadata
@@ -1,2 +1,2 @@
-16d1585350e82076bc700b5329fe8ee6a4852fcf SOURCES/samba-4.15.7.tar.xz
-8171b1a4b9628568e0f919c860bd6aa1a485e6db SOURCES/samba-4.15.7.tar.asc
+1a13f281ca0e53e695ef178c449085e38cbba03a SOURCES/samba-4.15.8.tar.xz
+5cf459df78a83145d64f83308869f483e364dca3 SOURCES/samba-4.15.8.tar.asc
diff --git a/SPECS/samba.spec b/SPECS/samba.spec
index 1ec0f92..2ec7e93 100644
--- a/SPECS/samba.spec
+++ b/SPECS/samba.spec
@@ -8,7 +8,7 @@
 
 %define main_release 100
 
-%define samba_version 4.15.7
+%define samba_version 4.15.8
 # This should be rc1 or nil
 %define pre_release %nil
 
@@ -939,7 +939,8 @@ xzcat %{SOURCE0} | gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} -
 export python_LDFLAGS="$(echo %{__global_ldflags} | sed -e 's/-Wl,-z,defs//g')"
 
 # Use the gold linker
-export LDFLAGS="%{__global_ldflags} -fuse-ld=gold"
+# See https://bugzilla.redhat.com/show_bug.cgi?id=2043178 for ld.gold issues
+#export LDFLAGS="%{__global_ldflags} -fuse-ld=gold"
 
 %configure \
         --enable-fhs \
@@ -3947,6 +3948,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Wed Jun 29 2022 - Anoop C S <anoopcs@samba.org> - 4.15.8-100
+- v4.15.8 GA
+
 * Wed Apr 27 2022 - Anoop C S <anoopcs@samba.org> - 4.15.7-100
 - v4.15.7 GA