diff --git a/PKGBUILD b/PKGBUILD
index 722d0fa..3e8a04b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -29,6 +29,8 @@ source=(
   82-edk2-ovmf-ia32-on-x86_64-csm.json
   $pkgbase-202202-brotli.patch
   $pkgbase-202202-ovmfpkgia32.patch
+  $pkgbase-202202-fix_nvme_command_set_checks_1.patch::https://github.com/tianocore/edk2/commit/f03bd3c33e45ff048730a878957a3ea1991c4290.patch
+  $pkgbase-202202-fix_nvme_command_set_checks_2.patch::https://github.com/tianocore/edk2/commit/982a79d9771cd2201a8b35e69b134ec8a4085fc5.patch
 )
 sha512sums=('200690a4867331de06e0478869b85577bc510213ebe679f2103160efb84d94c82ac8481ef1f15c3e42c1e9f22b7c5ef0d6c8f2c655bce7702ce843551cf9bb83'
             '1937796736613dcf4105a54e42ecb61f95a1cea74677156f9459aea0f2c95159359e766089632bf364ee6b0d28d661eb9957bce8fecc9d2436378d8d79e8d0a4'
@@ -45,7 +47,9 @@ sha512sums=('200690a4867331de06e0478869b85577bc510213ebe679f2103160efb84d94c82ac
             '7c9f8e7ce7451e7aa852998ffcd3ca95c08083c313dc8dcf0877969ef23d9da6f69c60bb1e652387a223da6e690524fa094bfbaed14d8bdae2853e68530b2f82'
             '891d3ea36d966114ff1f79c3619675a46b30b68def16ab426f2dee00bd0768f82ca0ee26acd7adedd379f25613e309ec9dfaed4e8a5d3f3e4fa7e8d845f55b18'
             'd074c794796d17d77eed7c34201d93d7ef3f1322fe1ea4a2ddd7137fae884d49f94f465ee39cfd8346b026142668a41f5a8671e521409505dd6d002f71c0eebc'
-            '5886eb35732c3850071ea903388861b40a50c59a11fc0384ed38413538baf8714d481cb21d23969c997701e9165972a73a7fd80cb49add4b611d5bcf953dff56')
+            '5886eb35732c3850071ea903388861b40a50c59a11fc0384ed38413538baf8714d481cb21d23969c997701e9165972a73a7fd80cb49add4b611d5bcf953dff56'
+            'f9babfc6c3c63a596ba30cf7d06f5db10babcd265b57a4e889bd7fb833eb5ae5d6de4cbfda48bba5954b2e9e079bedbb3207cb0396f7286d56f3dba5cab572dd'
+            'dacdfe301b1d3328160fb0b4fa629d5c83abe63a9a45ff38b6f33c211ac0787a0816ebff22e47363920b6510f65217eea163499e14706862a45daaf452e686da')
 b2sums=('d8411e6808b335ccd551349a10c983b9448a357e73273fa6c30a07785e27feffed0224950ee98b668712c33f6739a9b006e5043b7dfd014f48dba9fd449b3354'
         'af530258d9f7ca4f1bd1c6c344eb385e766e465c9341dd08797676165f67bbb82d3fd549ed7559dc12fb8c9c4db5e04fa6ec7ab729ec1467f5e8bce469ff5398'
         'SKIP'
@@ -61,7 +65,9 @@ b2sums=('d8411e6808b335ccd551349a10c983b9448a357e73273fa6c30a07785e27feffed02249
         '99bf35c4042fd5105a3b3b7f71b0aeb18db7811da4ed4481ffec485258619c30d33b08633f9a1c762d383e3bf0191053be9b88b9a4c142350186c6df1261d1f7'
         'd45b224c36eda139ca6ad9e4c6c04282724b264dd36a0b3ba904d71476b83e02963c8cadf1f1e1233955071d133dc0defa746740fa08b26398c489fbf6ba89a0'
         '644c071dc4fbbccaa64b0b1babcad60395ffce1a7a317a6f5380eff44cbb886be5f29156a8e967ab02b508a33954fcf5602606b43362cc3bb1936a8cfc3a3c07'
-        '937d507a0ffd9a87a9b008b01f26d4941dc8ee9c3f263fff8d782c8f29c933c8bbd10da9c44ad2ca106befa9db666062d55ed5d7fb793d758c4c8777f5e018c7')
+        '937d507a0ffd9a87a9b008b01f26d4941dc8ee9c3f263fff8d782c8f29c933c8bbd10da9c44ad2ca106befa9db666062d55ed5d7fb793d758c4c8777f5e018c7'
+        'd635c15d55f1055ff9a2ac94afebeec22385096fd1cacfe4160ae51be0b5711455adaf92c546bd1c13915688cf88790d7ffe63b6e6d837ea2d6715ebe70843e9'
+        'f124bb315dd531eb1c5cef37add10638748c80431db13d6a5b0ffe1d92e344cc17c50ddee7b25ce7eaeb0bad8141dfc1b721adc68e6f79ee86f2fd4d8c9a7580')
 validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491') # Matt Caswell <matt@openssl.org>
 _arch_list=(AARCH64 IA32 X64)
 _build_type=RELEASE
@@ -72,6 +78,9 @@ prepare() {
   patch -Np1 -d $pkgbase-$pkgbase-stable$pkgver -i ../$pkgbase-202202-brotli.patch
   # reintroduce include accidentally removed in https://github.com/tianocore/edk2/commit/b47575801e1903e8b316d01840572ce2681cf2c6
   patch -Np1 -d $pkgbase-$pkgbase-stable$pkgver -i ../$pkgbase-202202-ovmfpkgia32.patch
+  # patch to fix nvme command set checks (https://github.com/tianocore/edk2/pull/2682)
+  patch -Np1 -d $pkgbase-$pkgbase-stable$pkgver -i ../$pkgbase-202202-fix_nvme_command_set_checks_1.patch
+  patch -Np1 -d $pkgbase-$pkgbase-stable$pkgver -i ../$pkgbase-202202-fix_nvme_command_set_checks_2.patch
 
   cd $pkgbase-$pkgbase-stable$pkgver