diff --git a/main/refind/.checksums b/main/refind/.checksums
index 331abae7d..2fa8f8a33 100644
--- a/main/refind/.checksums
+++ b/main/refind/.checksums
@@ -1,2 +1,2 @@
-c537a5596218a8eb0e26828f36388a72  refind-0.12.0-gcc10.patch
+b44a3886f83ffd7a6abb476560c41cc4  gnu-efi.patch
 053502eb2a1bbbc40fd0b735cb57b33b  refind-src-0.13.2.tar.gz
diff --git a/main/refind/gnu-efi.patch b/main/refind/gnu-efi.patch
new file mode 100644
index 000000000..85f25e9c8
--- /dev/null
+++ b/main/refind/gnu-efi.patch
@@ -0,0 +1,48 @@
+Origin: https://sourceforge.net/p/refind/code/ci/10f838a4cd132a5595acaf3c54c15782151a61df
+Applied-Upstream: 0.13.3
+From 10f838a4cd132a5595acaf3c54c15782151a61df Mon Sep 17 00:00:00 2001
+From: Rod Smith <rodsmith@rodsbooks.com>
+Date: Sat, 23 Oct 2021 10:17:23 -0400
+Subject: [PATCH] Fix compile problems with recent GNU-EFI versions
+
+---
+ EfiLib/DevicePathUtilities.h | 13 -------------
+ EfiLib/gnuefi-helper.c       |  1 -
+ NEWS.txt                     |  3 +++
+ include/version.h            |  2 +-
+ 4 files changed, 4 insertions(+), 15 deletions(-)
+
+diff --git a/EfiLib/DevicePathUtilities.h b/EfiLib/DevicePathUtilities.h
+index b559671..14ed797 100644
+--- a/EfiLib/DevicePathUtilities.h
++++ b/EfiLib/DevicePathUtilities.h
+@@ -217,17 +217,4 @@ EFIAPI
+ --*/
+ ;
+ 
+-typedef struct {
+-  EFI_DEVICE_PATH_UTILS_GET_DEVICE_PATH_SIZE GetDevicePathSize;
+-  EFI_DEVICE_PATH_UTILS_DUP_DEVICE_PATH      DuplicateDevicePath;
+-  EFI_DEVICE_PATH_UTILS_APPEND_PATH          AppendDevicePath;
+-  EFI_DEVICE_PATH_UTILS_APPEND_NODE          AppendDeviceNode;
+-  EFI_DEVICE_PATH_UTILS_APPEND_INSTANCE      AppendDevicePathInstance;
+-  EFI_DEVICE_PATH_UTILS_GET_NEXT_INSTANCE    GetNextDevicePathInstance;
+-  EFI_DEVICE_PATH_UTILS_IS_MULTI_INSTANCE    IsDevicePathMultiInstance;
+-  EFI_DEVICE_PATH_UTILS_CREATE_NODE          CreateDeviceNode;
+-} EFI_DEVICE_PATH_UTILITIES_PROTOCOL;
+-
+-extern EFI_GUID gEfiDevicePathUtilitiesProtocolGuid;
+-
+ #endif
+diff --git a/EfiLib/gnuefi-helper.c b/EfiLib/gnuefi-helper.c
+index 246c261..8730403 100644
+--- a/EfiLib/gnuefi-helper.c
++++ b/EfiLib/gnuefi-helper.c
+@@ -20,7 +20,6 @@
+ #include "refit_call_wrapper.h"
+ #include "LegacyBios.h"
+ 
+-EFI_GUID gEfiDevicePathUtilitiesProtocolGuid = { 0x09576E91, 0x6D3F, 0x11D2, { 0x8E, 0x39, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }};
+ EFI_GUID gEfiLegacyBiosProtocolGuid = { 0xdb9a1e3d, 0x45cb, 0x4abb, { 0x85, 0x3b, 0xe5, 0x38, 0x7f, 0xdb, 0x2e, 0x2d }};
+ 
+ /**
diff --git a/main/refind/refind-0.12.0-gcc10.patch b/main/refind/refind-0.12.0-gcc10.patch
deleted file mode 100644
index 1f2e2bc0a..000000000
--- a/main/refind/refind-0.12.0-gcc10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Make.common
-+++ b/Make.common
-@@ -60,7 +60,7 @@
- #
- 
- # ...for both GNU-EFI and TianoCore....
--OPTIMFLAGS      = -Os -fno-strict-aliasing
-+OPTIMFLAGS      = -Os -fno-strict-aliasing -fno-tree-loop-distribute-patterns
- CFLAGS          = $(OPTIMFLAGS) -fno-stack-protector -fshort-wchar -Wall
- 
- # ...for GNU-EFI....
diff --git a/main/refind/spkgbuild b/main/refind/spkgbuild
index 0d7d0ef59..38a5fabfc 100644
--- a/main/refind/spkgbuild
+++ b/main/refind/spkgbuild
@@ -5,11 +5,13 @@ name=refind
 version=0.13.2
 release=1
 source="https://downloads.sourceforge.net/$name/$version/$name-src-$version.tar.gz
-	refind-0.12.0-gcc10.patch"
+	gnu-efi.patch"
 
 build() {
         cd $name-$version
 
+	patch -Np1 -i ../gnu-efi.patch
+
 	make -j1
         make -j1 gnuefi
         make -j1 fs_gnuefi