diff --git a/.gitignore b/.gitignore
index 296cdd7..6b84d7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/shim-15.5.tar.bz2
+SOURCES/shim-15.6.tar.bz2
diff --git a/.shim-unsigned-x64.metadata b/.shim-unsigned-x64.metadata
index e0f79e9..b5fa713 100644
--- a/.shim-unsigned-x64.metadata
+++ b/.shim-unsigned-x64.metadata
@@ -1 +1 @@
-b91f5eaced7ba1dcaef266af10763461889be5df SOURCES/shim-15.5.tar.bz2
+3df0ab5cefc74fdf865cb36aea0e923cb4b6b3ed SOURCES/shim-15.6.tar.bz2
diff --git a/SOURCES/shim.patches b/SOURCES/shim.patches
new file mode 100644
index 0000000..e69de29
diff --git a/SPECS/shim-unsigned-x64.spec b/SPECS/shim-unsigned-x64.spec
index 26331e2..6064d69 100644
--- a/SPECS/shim-unsigned-x64.spec
+++ b/SPECS/shim-unsigned-x64.spec
@@ -19,7 +19,7 @@
 %global dbxfile %{nil}
 
 Name:		shim-unsigned-%{efiarch}
-Version:	15.5
+Version:	15.6
 Release:	1.el9
 Summary:	First-stage UEFI bootloader
 ExclusiveArch:	x86_64
@@ -31,9 +31,12 @@ Source1:	redhatsecurebootca5.cer
 Source2:	%{dbxfile}
 %endif
 Source3:	sbat.redhat.csv
+Source4:	shim.patches
 
 Source100:	shim-find-debuginfo.sh
 
+%include %{SOURCE4}
+
 BuildRequires:	gcc make
 BuildRequires:	elfutils-libelf-devel
 BuildRequires:	git openssl-devel openssl
@@ -92,7 +95,7 @@ BuildArch:	noarch
 %debug_desc
 
 %prep
-%autosetup -S git -n shim-%{version}
+%autosetup -S git_am -n shim-%{version}
 git config --unset user.email
 git config --unset user.name
 mkdir build-%{efiarch}
@@ -155,6 +158,10 @@ cd ..
 %files debugsource -f build-%{efiarch}/debugsource.list
 
 %changelog
+* Wed Jun 01 2022 Peter Jones <pjones@redhat.com> - 15.6-1.el9
+- Update to shim-15.6
+  Resolves: CVE-2022-28737
+
 * Wed Mar 09 2022 Peter Jones <pjones@redhat.com> - 15.5-1
 - Update to shim-15.5
   Related: rhbz#1932057