diff --git a/.gitignore b/.gitignore
index 6b84d7a..e52ec17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-SOURCES/shim-15.6.tar.bz2
+SOURCES/redhatsecurebootca5.cer
+SOURCES/shim-15.8.tar.bz2
diff --git a/.shim-unsigned-x64.metadata b/.shim-unsigned-x64.metadata
index b5fa713..8379529 100644
--- a/.shim-unsigned-x64.metadata
+++ b/.shim-unsigned-x64.metadata
@@ -1 +1,2 @@
-3df0ab5cefc74fdf865cb36aea0e923cb4b6b3ed SOURCES/shim-15.6.tar.bz2
+e6f506462069aa17d2e8610503635c20f3a995c3 SOURCES/redhatsecurebootca5.cer
+cdec924ca437a4509dcb178396996ddf92c11183 SOURCES/shim-15.8.tar.bz2
diff --git a/SOURCES/redhatsecurebootca5.cer b/SOURCES/redhatsecurebootca5.cer
deleted file mode 100644
index dfb0284..0000000
Binary files a/SOURCES/redhatsecurebootca5.cer and /dev/null differ
diff --git a/SOURCES/sbat.redhat.csv b/SOURCES/sbat.redhat.csv
index 2135543..be9e036 100644
--- a/SOURCES/sbat.redhat.csv
+++ b/SOURCES/sbat.redhat.csv
@@ -1 +1 @@
-shim.redhat,1,Red Hat Inc,shim,15.5,secalert@redhat.com
+shim.redhat,3,Red Hat Inc,shim,15.8,secalert@redhat.com
diff --git a/SPECS/shim-unsigned-x64.spec b/SPECS/shim-unsigned-x64.spec
index af8e455..2662009 100644
--- a/SPECS/shim-unsigned-x64.spec
+++ b/SPECS/shim-unsigned-x64.spec
@@ -17,8 +17,8 @@
 %global shimaltdir %{shimversiondir}/%{efialtarch}
 
 Name:		shim-unsigned-%{efiarch}
-Version:	15.6
-Release:	1.el8
+Version:	15.8
+Release:	2.el8
 Summary:	First-stage UEFI bootloader
 ExclusiveArch:	x86_64
 License:	BSD
@@ -103,16 +103,17 @@ mkdir build-%{efialtarch}
 cp %{SOURCE3} data/
 
 %build
-COMMITID=$(cat commit)
-MAKEFLAGS="TOPDIR=.. -f ../Makefile COMMITID=${COMMITID} "
+COMMIT_ID=5914984a1ffeab841f482c791426d7ca9935a5e6
+MAKEFLAGS="TOPDIR=.. -f ../Makefile COMMIT_ID=${COMMIT_ID} "
 MAKEFLAGS+="EFIDIR=%{efidir} PKGNAME=shim RELEASE=%{release} "
 MAKEFLAGS+="ENABLE_SHIM_HASH=true "
+MAKEFLAGS+="SBAT_AUTOMATIC_DATE=2023012900 "
 MAKEFLAGS+="%{_smp_mflags}"
 if [ -s "%{SOURCE1}" ]; then
-	MAKEFLAGS="$MAKEFLAGS VENDOR_CERT_FILE=%{SOURCE1}"
+	MAKEFLAGS="$MAKEFLAGS VENDOR_CERT_FILE=%{SOURCE1} "
 fi
 if [ -s "%{SOURCE2}" ]; then
-	MAKEFLAGS="$MAKEFLAGS VENDOR_DBX_FILE=%{SOURCE2}"
+	MAKEFLAGS="$MAKEFLAGS VENDOR_DBX_FILE=%{SOURCE2} "
 fi
 
 cd build-%{efiarch}
@@ -128,15 +129,16 @@ setarch linux32 -B make ${MAKEFLAGS} ARCH=%{efialtarch} \
 cd ..
 
 %install
-COMMITID=$(cat commit)
-MAKEFLAGS="TOPDIR=.. -f ../Makefile COMMITID=${COMMITID} "
+COMMIT_ID=5914984a1ffeab841f482c791426d7ca9935a5e6
+MAKEFLAGS="TOPDIR=.. -f ../Makefile COMMIT_ID=${COMMIT_ID} "
 MAKEFLAGS+="EFIDIR=%{efidir} PKGNAME=shim RELEASE=%{release} "
 MAKEFLAGS+="ENABLE_HTTPBOOT=true ENABLE_SHIM_HASH=true "
+MAKEFLAGS+="SBAT_AUTOMATIC_DATE=2023012900 "
 if [ -s "%{SOURCE1}" ]; then
-	MAKEFLAGS="$MAKEFLAGS VENDOR_CERT_FILE=%{SOURCE1}"
+	MAKEFLAGS="$MAKEFLAGS VENDOR_CERT_FILE=%{SOURCE1} "
 fi
 if [ -s "%{SOURCE2}" ]; then
-	MAKEFLAGS="$MAKEFLAGS VENDOR_DBX_FILE=%{SOURCE2}"
+	MAKEFLAGS="$MAKEFLAGS VENDOR_DBX_FILE=%{SOURCE2} "
 fi
 
 cd build-%{efiarch}
@@ -178,6 +180,14 @@ cd ..
 %files debugsource -f build-%{efiarch}/debugsource.list
 
 %changelog
+* Wed Feb 07 2024 Peter Jones <pjones@redhat.com> - 15.8-2.el8
+- Rebuild to fix the commit ident and MAKEFLAGS
+  Resolves: RHEL-11259
+
+* Tue Dec 05 2023 Peter Jones <pjones@redhat.com> - 15.8-1.el8
+- Update to shim-15.8 for CVE-2023-40547
+  Resolves: RHEL-11259
+
 * Wed Jun 01 2022 Peter Jones <pjones@redhat.com> - 15.6-1.el8
 - Update to shim-15.6
   Resolves: CVE-2022-28737