diff --git a/0004-Work-around-Werror-maybe-uninitialized-not-being-ver.patch b/0004-Work-around-Werror-maybe-uninitialized-not-being-ver.patch
new file mode 100644
index 0000000..56fe302
--- /dev/null
+++ b/0004-Work-around-Werror-maybe-uninitialized-not-being-ver.patch
@@ -0,0 +1,27 @@
+From a031ddee7c78a7d66d214da8f5cd329641b1e6a8 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Thu, 2 Feb 2017 15:23:55 -0500
+Subject: [PATCH] Work around -Werror=maybe-uninitialized not being very
+ bright.
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ apps/route80h.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/apps/route80h.c b/apps/route80h.c
+index 723dd85..bf550a1 100644
+--- a/apps/route80h.c
++++ b/apps/route80h.c
+@@ -102,7 +102,7 @@ efi_main (EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *systab)
+ 	InitializeLib(image_handle, systab);
+ 	EFI_PCI_IO *pciio = NULL;
+ 	lpcif_t lpcif;
+-	EFI_STATUS rc;
++	EFI_STATUS rc = EFI_SUCCESS;
+ 	struct {
+ 		uint16_t vendor;
+ 		uint16_t device;
+-- 
+2.9.3
+
diff --git a/0005-Fix-a-sign-error-in-the-debughook-example-app.patch b/0005-Fix-a-sign-error-in-the-debughook-example-app.patch
new file mode 100644
index 0000000..a3295dc
--- /dev/null
+++ b/0005-Fix-a-sign-error-in-the-debughook-example-app.patch
@@ -0,0 +1,26 @@
+From 82e20ab31675b5177e0e05ad26c12d84ff632bc0 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Thu, 2 Feb 2017 15:25:48 -0500
+Subject: [PATCH] Fix a sign error in the debughook example app
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ apps/debughook.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/apps/debughook.c b/apps/debughook.c
+index fb6cdad..9888173 100644
+--- a/apps/debughook.c
++++ b/apps/debughook.c
+@@ -66,7 +66,7 @@ DebugHook(void)
+ 	while (x++) {
+ 		/* Make this so it can't /totally/ DoS us. */
+ #if defined(__x86_64__) || defined(__i386__) || defined(__i686__)
+-		if (x > 4294967294)
++		if (x > 4294967294ULL)
+ 			break;
+ 		__asm__ __volatile__("pause");
+ #elif defined(__aarch64__)
+-- 
+2.9.3
+
diff --git a/gnu-efi.spec b/gnu-efi.spec
index 500aa19..de2eb0e 100644
--- a/gnu-efi.spec
+++ b/gnu-efi.spec
@@ -14,6 +14,8 @@ Source: http://superb-dca2.dl.sourceforge.net/project/gnu-efi/gnu-efi-%{version}
 Patch0001: 0001-Mark-our-explicit-fall-through-so-Wextra-will-work-i.patch
 Patch0002: 0002-Fix-some-types-gcc-doesn-t-like.patch
 Patch0003: 0003-Fix-arm-build-paths-in-the-makefile.patch
+Patch0004: 0004-Work-around-Werror-maybe-uninitialized-not-being-ver.patch
+Patch0005: 0005-Fix-a-sign-error-in-the-debughook-example-app.patch
 
 %define debug_package %{nil}