diff --git a/edk2.spec b/edk2.spec
index af094d0..e5d1772 100644
--- a/edk2.spec
+++ b/edk2.spec
@@ -95,6 +95,9 @@ Patch0025: 0025-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch
 Patch0026: 0026-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch
 Patch0027: 0027-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch
 
+# Fedora specific
+Patch1000: fedora-Tweak-the-tools_def-to-support-cross-compiling.patch
+
 
 # python3-devel and libuuid-devel are required for building tools.
 # python3-devel is also needed for varstore template generation and
diff --git a/fedora-Tweak-the-tools_def-to-support-cross-compiling.patch b/fedora-Tweak-the-tools_def-to-support-cross-compiling.patch
new file mode 100644
index 0000000..b36f1e4
--- /dev/null
+++ b/fedora-Tweak-the-tools_def-to-support-cross-compiling.patch
@@ -0,0 +1,75 @@
+From d8b75ad1013b21c089a1af579b510f32c49c5b14 Mon Sep 17 00:00:00 2001
+From: Paolo Bonzini <pbonzini@redhat.com>
+Date: Thu, 16 Aug 2018 15:45:47 -0400
+Subject: [PATCH] Tweak the tools_def to support cross-compiling.
+
+These files are meant for customization, so this is not upstream.
+
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+Signed-off-by: Cole Robinson <crobinso@redhat.com>
+---
+ BaseTools/Conf/tools_def.template | 44 +++++++++++++++----------------
+ 1 file changed, 22 insertions(+), 22 deletions(-)
+
+diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
+index 933b3160fd..e62ccc322d 100755
+--- a/BaseTools/Conf/tools_def.template
++++ b/BaseTools/Conf/tools_def.template
+@@ -2350,17 +2350,17 @@ RELEASE_GCC49_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x20
+ ##################
+ # GCC5 IA32 definitions
+ ##################
+-*_GCC5_IA32_OBJCOPY_PATH         = DEF(GCC5_IA32_PREFIX)objcopy
+-*_GCC5_IA32_CC_PATH              = DEF(GCC5_IA32_PREFIX)gcc
+-*_GCC5_IA32_SLINK_PATH           = DEF(GCC5_IA32_PREFIX)gcc-ar
+-*_GCC5_IA32_DLINK_PATH           = DEF(GCC5_IA32_PREFIX)gcc
+-*_GCC5_IA32_ASLDLINK_PATH        = DEF(GCC5_IA32_PREFIX)gcc
+-*_GCC5_IA32_ASM_PATH             = DEF(GCC5_IA32_PREFIX)gcc
+-*_GCC5_IA32_PP_PATH              = DEF(GCC5_IA32_PREFIX)gcc
+-*_GCC5_IA32_VFRPP_PATH           = DEF(GCC5_IA32_PREFIX)gcc
+-*_GCC5_IA32_ASLCC_PATH           = DEF(GCC5_IA32_PREFIX)gcc
+-*_GCC5_IA32_ASLPP_PATH           = DEF(GCC5_IA32_PREFIX)gcc
+-*_GCC5_IA32_RC_PATH              = DEF(GCC5_IA32_PREFIX)objcopy
++*_GCC5_IA32_OBJCOPY_PATH         = ENV(GCC5_IA32_PREFIX)objcopy
++*_GCC5_IA32_CC_PATH              = ENV(GCC5_IA32_PREFIX)gcc
++*_GCC5_IA32_SLINK_PATH           = ENV(GCC5_IA32_PREFIX)gcc-ar
++*_GCC5_IA32_DLINK_PATH           = ENV(GCC5_IA32_PREFIX)gcc
++*_GCC5_IA32_ASLDLINK_PATH        = ENV(GCC5_IA32_PREFIX)gcc
++*_GCC5_IA32_ASM_PATH             = ENV(GCC5_IA32_PREFIX)gcc
++*_GCC5_IA32_PP_PATH              = ENV(GCC5_IA32_PREFIX)gcc
++*_GCC5_IA32_VFRPP_PATH           = ENV(GCC5_IA32_PREFIX)gcc
++*_GCC5_IA32_ASLCC_PATH           = ENV(GCC5_IA32_PREFIX)gcc
++*_GCC5_IA32_ASLPP_PATH           = ENV(GCC5_IA32_PREFIX)gcc
++*_GCC5_IA32_RC_PATH              = ENV(GCC5_IA32_PREFIX)objcopy
+ 
+ *_GCC5_IA32_ASLCC_FLAGS          = DEF(GCC5_ASLCC_FLAGS) -m32
+ *_GCC5_IA32_ASLDLINK_FLAGS       = DEF(GCC5_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386 -no-pie
+@@ -2382,17 +2382,17 @@ RELEASE_GCC5_IA32_DLINK_FLAGS    = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl,
+ ##################
+ # GCC5 X64 definitions
+ ##################
+-*_GCC5_X64_OBJCOPY_PATH          = DEF(GCC5_X64_PREFIX)objcopy
+-*_GCC5_X64_CC_PATH               = DEF(GCC5_X64_PREFIX)gcc
+-*_GCC5_X64_SLINK_PATH            = DEF(GCC5_X64_PREFIX)gcc-ar
+-*_GCC5_X64_DLINK_PATH            = DEF(GCC5_X64_PREFIX)gcc
+-*_GCC5_X64_ASLDLINK_PATH         = DEF(GCC5_X64_PREFIX)gcc
+-*_GCC5_X64_ASM_PATH              = DEF(GCC5_X64_PREFIX)gcc
+-*_GCC5_X64_PP_PATH               = DEF(GCC5_X64_PREFIX)gcc
+-*_GCC5_X64_VFRPP_PATH            = DEF(GCC5_X64_PREFIX)gcc
+-*_GCC5_X64_ASLCC_PATH            = DEF(GCC5_X64_PREFIX)gcc
+-*_GCC5_X64_ASLPP_PATH            = DEF(GCC5_X64_PREFIX)gcc
+-*_GCC5_X64_RC_PATH               = DEF(GCC5_X64_PREFIX)objcopy
++*_GCC5_X64_OBJCOPY_PATH          = ENV(GCC5_X64_PREFIX)objcopy
++*_GCC5_X64_CC_PATH               = ENV(GCC5_X64_PREFIX)gcc
++*_GCC5_X64_SLINK_PATH            = ENV(GCC5_X64_PREFIX)gcc-ar
++*_GCC5_X64_DLINK_PATH            = ENV(GCC5_X64_PREFIX)gcc
++*_GCC5_X64_ASLDLINK_PATH         = ENV(GCC5_X64_PREFIX)gcc
++*_GCC5_X64_ASM_PATH              = ENV(GCC5_X64_PREFIX)gcc
++*_GCC5_X64_PP_PATH               = ENV(GCC5_X64_PREFIX)gcc
++*_GCC5_X64_VFRPP_PATH            = ENV(GCC5_X64_PREFIX)gcc
++*_GCC5_X64_ASLCC_PATH            = ENV(GCC5_X64_PREFIX)gcc
++*_GCC5_X64_ASLPP_PATH            = ENV(GCC5_X64_PREFIX)gcc
++*_GCC5_X64_RC_PATH               = ENV(GCC5_X64_PREFIX)objcopy
+ 
+ *_GCC5_X64_ASLCC_FLAGS           = DEF(GCC5_ASLCC_FLAGS) -m64
+ *_GCC5_X64_ASLDLINK_FLAGS        = DEF(GCC5_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64