diff --git a/gnu-efi.spec b/gnu-efi.spec
index c286acb3944cd2b10fa1df1b591c57203a67205f..07fdb9948c06f58d00e04051cb05fe93842e28be 100644
--- a/gnu-efi.spec
+++ b/gnu-efi.spec
@@ -7,11 +7,9 @@ Epoch:         1
 License:       BSD
 URL:           ftp://ftp.hpl.hp.com/pub/linux-ia64
 ExclusiveArch: x86_64 aarch64
-%ifarch x86_64
-BuildRequires: /usr/include/gnu/stubs-32.h
-%endif
 Source:        http://superb-dca2.dl.sourceforge.net/project/gnu-efi/gnu-efi-3.0.6.tar.bz2
-
+#stubs-32.h comes from http://www.gnu.org/software/glibc/
+Source1:       stubs-32.h
 
 Patch0001:     0001-PATCH-Disable-AVX-instruction-set-on-IA32-and-x86_64.patch
 Patch0002:     0002-Use-ARFLAGS-when-invoking-ar.patch
@@ -39,6 +37,7 @@ Patch0023:     0023-Call-ar-in-deterministic-mode.patch
 Patch0024:     0024-Add-debug-helper-applications.patch
 Patch0025:     0025-Bump-revision-from-VERSION-3.0.7-to-VERSION-3.0.8.patch
 
+Patch9000:     stubs-32-h.patch
 
 %global efidir %(eval echo $(grep ^ID= /etc/os-release | sed  's/^ID=//'))
 
diff --git a/stubs-32-h.patch b/stubs-32-h.patch
new file mode 100644
index 0000000000000000000000000000000000000000..3bff6da3653964adadb7455e97ef80bf095fd2dd
--- /dev/null
+++ b/stubs-32-h.patch
@@ -0,0 +1,24 @@
+diff -Nur gnu-efi-3.0.6-bak/gnuefi/gnu/stubs-32.h gnu-efi-3.0.6/gnuefi/gnu/stubs-32.h
+--- gnu-efi-3.0.6-bak/gnuefi/gnu/stubs-32.h     1969-12-31 19:00:00.000000000 -0500
++++ gnu-efi-3.0.6/gnuefi/gnu/stubs-32.h 2019-12-13 01:14:49.910471300 -0500
+@@ -0,0 +1,20 @@
++/* This file is automatically generated.
++   It defines a symbol `__stub_FUNCTION' for each function
++   in the C library which is a stub, meaning it will fail
++   every time called, usually setting errno to ENOSYS.  */
++
++#ifdef _LIBC
++ #error Applications may not define the macro _LIBC
++#endif
++
++#define __stub_chflags
++#define __stub_fattach
++#define __stub_fchflags
++#define __stub_fdetach
++#define __stub_gtty
++#define __stub_lchmod
++#define __stub_revoke
++#define __stub_setlogin
++#define __stub_sigreturn
++#define __stub_sstk
++#define __stub_stty
diff --git a/stubs-32.h b/stubs-32.h
new file mode 100644
index 0000000000000000000000000000000000000000..ec6406071abbf66d5650a018580588e826b66558
--- /dev/null
+++ b/stubs-32.h
@@ -0,0 +1,20 @@
+/* This file is automatically generated.
+ *    It defines a symbol `__stub_FUNCTION' for each function
+ *       in the C library which is a stub, meaning it will fail
+ *          every time called, usually setting errno to ENOSYS.  */
+
+#ifdef _LIBC
+ #error Applications may not define the macro _LIBC
+#endif
+
+#define __stub_chflags
+#define __stub_fattach
+#define __stub_fchflags
+#define __stub_fdetach
+#define __stub_gtty
+#define __stub_lchmod
+#define __stub_revoke
+#define __stub_setlogin
+#define __stub_sigreturn
+#define __stub_sstk
+#define __stub_stty