diff -Nru shim-0.7/debian/changelog shim-0.7/debian/changelog
--- shim-0.7/debian/changelog	2014-10-08 20:41:55.000000000 +0200
+++ shim-0.7/debian/changelog	2015-03-09 18:49:05.000000000 +0100
@@ -1,3 +1,10 @@
+shim (0.7-0ubuntu5) vivid; urgency=medium
+
+  * Fix build with GCC 5, forcing -std=gnu89 to not rely on stdint.h
+    required by efibind.h, and not found with -nostdinc.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 09 Mar 2015 18:20:36 +0100
+
 shim (0.7-0ubuntu4) utopic; urgency=medium
 
   * SECURITY UPDATE: heap overflow and out-of-bounds read access when
diff -Nru shim-0.7/debian/patches/gcc-5.diff shim-0.7/debian/patches/gcc-5.diff
--- shim-0.7/debian/patches/gcc-5.diff	1970-01-01 01:00:00.000000000 +0100
+++ shim-0.7/debian/patches/gcc-5.diff	2015-03-09 19:05:14.000000000 +0100
@@ -0,0 +1,39 @@
+Index: b/Makefile
+===================================================================
+--- a/Makefile
++++ b/Makefile
+@@ -15,7 +15,7 @@ EFI_CRT_OBJS 	= $(EFI_PATH)/crt0-efi-$(A
+ EFI_LDS		= elf_$(ARCH)_efi.lds
+ 
+ DEFAULT_LOADER	:= \\\\grubx64.efi
+-CFLAGS		= -ggdb -O0 -fno-stack-protector -fno-strict-aliasing -fpic \
++CFLAGS		= -std=gnu89 -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 \
+ 		  "-DDEFAULT_LOADER=L\"$(DEFAULT_LOADER)\"" \
+Index: b/Cryptlib/Makefile
+===================================================================
+--- a/Cryptlib/Makefile
++++ b/Cryptlib/Makefile
+@@ -9,7 +9,7 @@ EFI_PATH	= /usr/lib64/gnuefi
+ LIB_GCC		= $(shell $(CC) -print-libgcc-file-name)
+ EFI_LIBS	= -lefi -lgnuefi $(LIB_GCC)
+ 
+-CFLAGS		= -ggdb -O0 -I. -fno-stack-protector -fno-strict-aliasing -fpic -fshort-wchar \
++CFLAGS		= -std=gnu89 -ggdb -O0 -I. -fno-stack-protector -fno-strict-aliasing -fpic -fshort-wchar \
+ 		  -Wall $(EFI_INCLUDES) -mno-red-zone -maccumulate-outgoing-args -mno-sse -mno-mmx
+ ifeq ($(ARCH),x86_64)
+ 	CFLAGS	+= -DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI
+Index: b/Cryptlib/OpenSSL/Makefile
+===================================================================
+--- a/Cryptlib/OpenSSL/Makefile
++++ b/Cryptlib/OpenSSL/Makefile
+@@ -9,7 +9,7 @@ EFI_PATH	= /usr/lib64/gnuefi
+ LIB_GCC		= $(shell $(CC) -print-libgcc-file-name)
+ EFI_LIBS	= -lefi -lgnuefi $(LIB_GCC)
+ 
+-CFLAGS		= -ggdb -O0 -I. -I.. -I../Include/ -Icrypto -fno-stack-protector -fno-strict-aliasing -fpic -fshort-wchar -nostdinc -mno-mmx -mno-sse -mno-red-zone -maccumulate-outgoing-args \
++CFLAGS		= -std=gnu89 -ggdb -O0 -I. -I.. -I../Include/ -Icrypto -fno-stack-protector -fno-strict-aliasing -fpic -fshort-wchar -nostdinc -mno-mmx -mno-sse -mno-red-zone -maccumulate-outgoing-args \
+ 		  -Wall $(EFI_INCLUDES) -DOPENSSL_SYSNAME_UWIN -DOPENSSL_SYS_UEFI -DL_ENDIAN -DSIXTY_FOUR_BIT_LONG -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_SEED -DOPENSSL_NO_RC5 -DOPENSSL_NO_MDC2 -DOPENSSL_NO_SOCK -DOPENSSL_NO_CMS -DOPENSSL_NO_JPAKE -DOPENSSL_NO_CAPIENG -DOPENSSL_NO_ERR -DOPENSSL_NO_KRB5 -DOPENSSL_NO_DYNAMIC_ENGINE -DGETPID_IS_MEANINGLESS -DOPENSSL_NO_STDIO -DOPENSSL_NO_FP_API -DOPENSSL_NO_DGRAM -DOPENSSL_NO_SHA0 -DOPENSSL_NO_LHASH -DOPENSSL_NO_HW -DOPENSSL_NO_OCSP -DOPENSSL_NO_LOCKING -DOPENSSL_NO_DEPRECATED -DOPENSSL_SMALL_FOOTPRINT -DPEDANTIC
+ ifeq ($(ARCH),x86_64)
+ 	CFLAGS	+= -DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI
diff -Nru shim-0.7/debian/patches/series shim-0.7/debian/patches/series
--- shim-0.7/debian/patches/series	2014-10-08 07:49:18.000000000 +0200
+++ shim-0.7/debian/patches/series	2015-03-09 18:44:23.000000000 +0100
@@ -3,3 +3,4 @@
 sbsigntool-not-pesign
 0001-Update-openssl-to-0.9.8za.patch
 CVE-2014-3675.patch
+gcc-5.diff