diff --git a/shim.spec b/shim.spec
index bb2a4f9..e8b29e1 100644
--- a/shim.spec
+++ b/shim.spec
@@ -1,11 +1,11 @@
 Name:           shim
-Version:        0.8
-Release:        2%{?dist}
+Version:        0.9
+Release:        1%{?dist}
 Summary:        First-stage UEFI bootloader
 
 License:        BSD
-URL:            http://www.codon.org.uk/~mjg59/shim/
-Source0:        https://github.com/mjg59/%{name}/releases/download/%{version}/%{name}-%{version}.tar.bz2
+URL:            https://github.com/rhinstaller/shim
+Source0:        https://github.com/rhinstaller/shim/releases/download/%{version}/shim-%{version}.tar.bz2
 Source1:	fedora-ca.cer
 
 # currently here's what's in our dbx:
@@ -17,12 +17,12 @@ Source1:	fedora-ca.cer
 # gcdx64.efi 99fcaa957786c155a92b40be9c981c4e4685b8c62b408cb0f6cb2df9c30b9978
 # woops.
 Source2:	dbx.esl
-Source4:	rhtest.cer
+Source3:	rhtest.cer
 
 BuildRequires: git openssl-devel openssl
 BuildRequires: pesign >= 0.106-1
-BuildRequires: gnu-efi = 3.0w
-BuildRequires: gnu-efi-devel = 3.0w
+BuildRequires: gnu-efi >= 3.0.3-3
+BuildRequires: gnu-efi-devel >= 3.0.3-3
 
 # Shim uses OpenSSL, but cannot use the system copy as the UEFI ABI is not
 # compatible with SysV (there's no red zone under UEFI) and there isn't a
@@ -33,14 +33,9 @@ Provides: bundled(openssl) = 0.9.8zb
 # Shim is only required on platforms implementing the UEFI secure boot
 # protocol. The only one of those we currently wish to support is 64-bit x86.
 # Adding further platforms will require adding appropriate relocation code.
-ExclusiveArch: x86_64 aarch64
+ExclusiveArch: x86_64
 
-%ifarch x86_64
 %global efiarch x64
-%endif
-%ifarch aarch64
-%global efiarch aa64
-%endif
 
 # Figure out the right file path to use
 %if 0%{?rhel}
@@ -74,15 +69,10 @@ git config --unset user.name
 
 %build
 MAKEFLAGS=""
-%ifarch aarch64
-if [ -f "%{SOURCE4}" ]; then
-	MAKEFLAGS="VENDOR_CERT_FILE=%{SOURCE4} VENDOR_DBX_FILE=%{SOURCE2}"
-fi
-%else
-if [ -f "%{SOURCE1}" ]; then
-	MAKEFLAGS="VENDOR_CERT_FILE=%{SOURCE1} VENDOR_DBX_FILE=%{SOURCE2}"
+if [ -f "%{SOURCE3}" ]; then
+	MAKEFLAGS="VENDOR_CERT_FILE=%{SOURCE3} VENDOR_DBX_FILE=%{SOURCE2}"
 fi
-%endif
+MAKEFLAGS="$MAKEFLAGS RELEASE=%{release}"
 make 'DEFAULT_LOADER=\\\\grub%{efiarch}.efi' ${MAKEFLAGS} shim.efi MokManager.efi fallback.efi
 
 %install
@@ -105,6 +95,10 @@ install -m 0644 MokManager.efi.debug $RPM_BUILD_ROOT/usr/lib/debug/%{_datadir}/s
 %{_datadir}/shim/*
 
 %changelog
+* Fri Apr 28 2017 Petr Šabata <contyk@redhat.com> - 0.9-1
+- Updating to 0.9 to enable building with gcc7
+- Mostly mirroring the key shim-unsigned-aarch64 0.9 changes
+
 * Wed Dec 03 2014 Peter Jones <pjones@redhat.com> - 0.8-2
 - Fix bootloader path and whitelist certificates on ARM Aarch64.
   Resolves: rhbz#1170289
diff --git a/sources b/sources
index c19996a..4221de5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-af9b5f559d1f9e370ad119c244d0f563  shim-0.8.tar.bz2
-79d671bc59eb0bb5f0a7997db8f9ec98  rhtest.cer
+SHA512 (shim-0.9.tar.bz2) = 780f3eb3bfae366f25591eb5c46f7853614c03d79f88f0890f5e1bd614f2a9e859b355faa333894a16c048f50cbe9dc65ebe414e8fe07ce0657edec42836be0c