diff --git a/srcpkgs/edk2-ovmf/patches/brotli.patch b/srcpkgs/edk2-ovmf/patches/brotli.patch
index b7a58023251..cdfd5b1fbc8 100644
--- a/srcpkgs/edk2-ovmf/patches/brotli.patch
+++ b/srcpkgs/edk2-ovmf/patches/brotli.patch
@@ -77,9 +77,9 @@ diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
 index 8d38383915..ba2d0290e7 100644
 --- a/MdeModulePkg/MdeModulePkg.dec
 +++ b/MdeModulePkg/MdeModulePkg.dec
-@@ -24,9 +24,6 @@
- [Includes]
+@@ -26,9 +26,6 @@
    Include
+   Test/Mock/Include
  
 -[Includes.Common.Private]
 -  Library/BrotliCustomDecompressLib/brotli/c/include
diff --git a/srcpkgs/edk2-ovmf/template b/srcpkgs/edk2-ovmf/template
index 7a3484dfea6..ce9e7c68ee2 100644
--- a/srcpkgs/edk2-ovmf/template
+++ b/srcpkgs/edk2-ovmf/template
@@ -1,11 +1,12 @@
 # Template file for 'edk2-ovmf'
 pkgname=edk2-ovmf
-version=202402
-revision=2
-_mipi_commit=370b5944c046bab043dd8b133727b2135af7747a
-_openssl_version=3.0.9
-_mbedtls_commit=8c89224991adff88d53cd380f42a2baa36f91454
-_softfloat_commit=b64af41c3276f97f0e181920400ee056b9c88037
+version=202405
+revision=1
+_mipi_ver=370b5944c046bab043dd8b133727b2135af7747a
+_openssl_ver=3.0.9
+_mbedtls_ver=8c89224991adff88d53cd380f42a2baa36f91454
+_softfloat_ver=b64af41c3276f97f0e181920400ee056b9c88037
+_spdm_ver=3.3.0
 archs="x86_64* i686* aarch64*"
 hostmakedepends="acpica-utils nasm python3 libuuid-devel"
 short_desc="EFI Development Kit II - Open Virtual Machine Firmware"
@@ -14,19 +15,23 @@ license="BSD-2-Clause-Patent, MIT"
 homepage="https://github.com/tianocore/tianocore.github.io/wiki/EDK-II"
 changelog="https://github.com/tianocore/edk2/releases"
 distfiles="https://github.com/tianocore/edk2/archive/refs/tags/edk2-stable${version}.tar.gz
- https://github.com/MIPI-Alliance/public-mipi-sys-t/archive/${_mipi_commit}.tar.gz
- https://www.openssl.org/source/openssl-${_openssl_version}.tar.gz
- https://github.com/Mbed-TLS/mbedtls/archive/${_mbedtls_commit}.tar.gz
- https://github.com/ucb-bar/berkeley-softfloat-3/archive/${_softfloat_commit}.tar.gz"
-checksum="e3666babcd116d45c165009d94ced611ba23186e7e0ead21c4ec97afd2f7f78a
+ https://github.com/MIPI-Alliance/public-mipi-sys-t/archive/${_mipi_ver}.tar.gz>mipi-${_mipi_ver}.tar.gz
+ https://www.openssl.org/source/openssl-${_openssl_ver}.tar.gz
+ https://github.com/Mbed-TLS/mbedtls/archive/${_mbedtls_ver}.tar.gz>mbedtls-${_mbedtls_ver}.tar.gz
+ https://github.com/ucb-bar/berkeley-softfloat-3/archive/${_softfloat_ver}.tar.gz>softfloat-${_softfloat_ver}.tar.gz
+ https://github.com/DMTF/libspdm/archive/refs/tags/${_spdm_ver}.tar.gz>libspdm-${_spdm_ver}.tar.gz"
+checksum="53cbf51f2ca7aea9ef67ca9aeb6276dc5643c87b5ccdb7fe9f9936361623d7be
  9fda3b9a78343ab2be6f06ce6396536e7e065abac29b47c8eb2e42cbb4c4f00b
  eb1ab04781474360f77c318ab89d8c5a03abc38e63d65a603cabbf1b00a1dc90
  b5c7e7c54e013c168f4aae036e59912785f11b4aeebd57f6165a14e879b9a82c
- faae889814ea6a292f7ca03d9b36e6c7e95bab2a64777804883cc822b8d48757"
-skip_extraction="${_mipi_commit}.tar.gz
- openssl-${_openssl_version}.tar.gz
- ${_mbedtls_commit}.tar.gz
- ${_softfloat_commit}.tar.gz"
+ faae889814ea6a292f7ca03d9b36e6c7e95bab2a64777804883cc822b8d48757
+ 178c7bd785b3ac71b886b8360dab926d42e4d5edc55009bcd341295f25f56c91"
+
+skip_extraction="mipi-${_mipi_ver}.tar.gz
+ openssl-${_openssl_ver}.tar.gz
+ mbedtls-${_mbedtls_ver}.tar.gz
+ softfloat-${_softfloat_ver}.tar.gz
+ libspdm-${_spdm_ver}.tar.gz"
 
 case "$XBPS_TARGET_LIBC" in
 	glibc) _pfx="gnu" ;;
@@ -44,10 +49,11 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 post_extract() {
-	vsrcextract -C MdePkg/Library/MipiSysTLib/mipisyst "${_mipi_commit}.tar.gz"
-	vsrcextract -C CryptoPkg/Library/OpensslLib/openssl "openssl-${_openssl_version}.tar.gz"
-	vsrcextract -C CryptoPkg/Library/MbedTlsLib/mbedtls "${_mbedtls_commit}.tar.gz"
-	vsrcextract -C ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 "${_softfloat_commit}.tar.gz"
+	vsrcextract -C MdePkg/Library/MipiSysTLib/mipisyst "mipi-${_mipi_ver}.tar.gz"
+	vsrcextract -C CryptoPkg/Library/OpensslLib/openssl "openssl-${_openssl_ver}.tar.gz"
+	vsrcextract -C CryptoPkg/Library/MbedTlsLib/mbedtls "mbedtls-${_mbedtls_ver}.tar.gz"
+	vsrcextract -C ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 "softfloat-${_softfloat_ver}.tar.gz"
+	vsrcextract -C SecurityPkg/DeviceSecurity/SpdmLib/libspdm "libspdm-${_spdm_ver}.tar.gz"
 }
 
 do_build() {