diff --git a/core/efibootmgr/build b/core/efibootmgr/build
index e3a1d5fc..befb6485 100755
--- a/core/efibootmgr/build
+++ b/core/efibootmgr/build
@@ -1,5 +1,7 @@
 #!/bin/sh -e
 
+patch -p1 < efivar.patch
+
 make EXTRA_CFLAGS=-Os EFIDIR=/boot/EFI
 
 install -d "$1/usr/bin/"
diff --git a/core/efibootmgr/checksums b/core/efibootmgr/checksums
index 96f692e2..cb79ce74 100644
--- a/core/efibootmgr/checksums
+++ b/core/efibootmgr/checksums
@@ -1 +1,2 @@
 22a95ebe0d5c9fb2915b3a100450f8f37484d1dbb8b296f55b343cc84f10397d  17.tar.gz
+167ac36fb4bd59e90fede0422280117c0b50d0ac3c0c7d478fea427cb9a6944c  efivar.patch
diff --git a/core/efibootmgr/patches/efivar.patch b/core/efibootmgr/patches/efivar.patch
new file mode 100644
index 00000000..614195f3
--- /dev/null
+++ b/core/efibootmgr/patches/efivar.patch
@@ -0,0 +1,14 @@
+diff --git a/src/efibootmgr.c b/src/efibootmgr.c
+index de38f01..4e1a680 100644
+--- a/src/efibootmgr.c
++++ b/src/efibootmgr.c
+@@ -1536,9 +1536,6 @@ parse_opts(int argc, char **argv)
+ 					       "invalid numeric value %s\n",
+ 					       optarg);
+ 			}
+-                        /* XXX efivar-36 accidentally doesn't have a public
+-                         * header for this */
+-			extern int efi_set_verbose(int verbosity, FILE *errlog);
+ 			efi_set_verbose(opts.verbose - 2, stderr);
+ 			break;
+ 		case 'V':
diff --git a/core/efibootmgr/sources b/core/efibootmgr/sources
index 3383fc92..4afc6a0a 100644
--- a/core/efibootmgr/sources
+++ b/core/efibootmgr/sources
@@ -1 +1,2 @@
 https://github.com/rhboot/efibootmgr/archive/17.tar.gz
+patches/efivar.patch