diff --git a/debian/changelog b/debian/changelog
index 652b6a7..b3af8bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ shim (0.8-0ubuntu1) UNRELEASED; urgency=medium
   * debian/patches/CVE-2014-3675.patch, debian/patches/CVE-2014-3677.patch,
     debian/patches/0001-Update-openssl-to-0.9.8za.patch: dropped, included
     in the upstream release.
+  * debian/patches/sbsigntool-not-pesign,debian/patches/second-stage-path:
+    refreshed.
 
  -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Wed, 06 May 2015 09:49:45 -0400
 
diff --git a/debian/patches/sbsigntool-not-pesign b/debian/patches/sbsigntool-not-pesign
index 66b0f12..c91a647 100644
--- a/debian/patches/sbsigntool-not-pesign
+++ b/debian/patches/sbsigntool-not-pesign
@@ -5,13 +5,17 @@ Description: Sign MokManager with sbsigntool instead of pesign
 Author: Steve Langasek <steve.langasek@canonical.com>
 Forwarded: not-needed
 
-Index: shim/Makefile
+---
+ Makefile |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: b/Makefile
 ===================================================================
---- shim.orig/Makefile
-+++ shim/Makefile
-@@ -88,8 +88,8 @@
+--- a/Makefile
++++ b/Makefile
+@@ -144,8 +144,8 @@ FORMAT		?= --target efi-app-$(ARCH)
  		-j .debug_line -j .debug_str -j .debug_ranges \
- 		--target=efi-app-$(ARCH) $^ $@.debug
+ 		$(FORMAT) $^ $@.debug
  
 -%.efi.signed: %.efi certdb/secmod.db
 -	pesign -n certdb -i $< -c "shim" -s -o $@ -f
diff --git a/debian/patches/second-stage-path b/debian/patches/second-stage-path
index d9265be..fef139c 100644
--- a/debian/patches/second-stage-path
+++ b/debian/patches/second-stage-path
@@ -5,16 +5,20 @@ Description: Chainload grubx64.efi, not grub.efi
  anyway, not grub.efi.)
 Author: Steve Langasek <steve.langasek@ubuntu.com>
 
-Index: shim/Makefile
+---
+ Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: b/Makefile
 ===================================================================
---- shim.orig/Makefile
-+++ shim/Makefile
-@@ -14,7 +14,7 @@
+--- a/Makefile
++++ b/Makefile
+@@ -18,7 +18,7 @@ EFI_LIBS	= -lefi -lgnuefi --start-group
  EFI_CRT_OBJS 	= $(EFI_PATH)/crt0-efi-$(ARCH).o
  EFI_LDS		= elf_$(ARCH)_efi.lds
  
 -DEFAULT_LOADER	:= \\\\grub.efi
 +DEFAULT_LOADER	:= \\\\grubx64.efi
  CFLAGS		= -ggdb -O0 -fno-stack-protector -fno-strict-aliasing -fpic \
- 		  -fshort-wchar -Wall -Werror -mno-red-zone -maccumulate-outgoing-args \
- 		  -mno-mmx -mno-sse -fno-builtin \
+ 		  -fshort-wchar -Wall -Wsign-compare -Werror -fno-builtin \
+ 		  -Werror=sign-compare \