diff -Nru grub2-2.02~beta2/debian/changelog grub2-2.02~beta2/debian/changelog
--- grub2-2.02~beta2/debian/changelog	2017-07-14 16:20:11.000000000 +0000
+++ grub2-2.02~beta2/debian/changelog	2018-07-04 19:28:17.000000000 +0000
@@ -1,3 +1,13 @@
+grub2 (2.02~beta2-9ubuntu1.15) trusty; urgency=medium
+
+  * util/grub-install.c: Use MokManager EFI binary name without
+    the .signed extension now that shim handles signing via sbsigntool
+    natively. (LP: #1708245)
+    - debian/patches/install_signed.patch
+  * debian/control: Breaks shim << 13 due to the renamed MokManager binary. 
+
+ -- Mathieu Trudel-Lapierre <cyphermox@ubuntu.com>  Wed, 04 Jul 2018 15:28:17 -0400
+
 grub2 (2.02~beta2-9ubuntu1.14) trusty; urgency=medium
 
   * debian/patches/install_signed.patch: update to use the new names for the
diff -Nru grub2-2.02~beta2/debian/control grub2-2.02~beta2/debian/control
--- grub2-2.02~beta2/debian/control	2016-09-22 16:34:56.000000000 +0000
+++ grub2-2.02~beta2/debian/control	2018-07-04 19:28:17.000000000 +0000
@@ -94,7 +94,7 @@
 Depends: grub-common (= ${binary:Version}), dpkg (>= 1.15.4) | install-info, ${shlibs:Depends}, ${misc:Depends}
 Replaces: grub, grub-legacy, grub-common (<< 1.99-1), grub-pc (<< 2.00-4), grub-ieee1275 (<< 2.00-4), grub-efi (<< 1.99-1), grub-coreboot (<< 2.00-4), grub-linuxbios (<< 1.99-1), grub-efi-ia32 (<< 2.00-4), grub-efi-amd64 (<< 2.00-4), grub-efi-ia64 (<< 2.00-4), grub-ieee1275 (<< 2.00-4), grub-yeeloong (<< 2.00-4)
 Conflicts: grub (<< 0.97-54), grub-legacy, ${legacy-doc-conflicts}
-Breaks: shim (<< 0.9+1474479173.6c180c6-0ubuntu1~)
+Breaks: shim (<< 13)
 Multi-Arch: foreign
 Description: GRand Unified Bootloader (common files for version 2)
  This package contains common files shared by the distinct flavours of GRUB.
diff -Nru grub2-2.02~beta2/debian/patches/install_signed.patch grub2-2.02~beta2/debian/patches/install_signed.patch
--- grub2-2.02~beta2/debian/patches/install_signed.patch	2017-07-14 16:20:11.000000000 +0000
+++ grub2-2.02~beta2/debian/patches/install_signed.patch	2018-07-04 19:28:11.000000000 +0000
@@ -13,8 +13,8 @@
 
 Patch-Name: install_signed.patch
 ---
- util/grub-install.c |  179 ++++++++++++++++++++++++++++++++++++++--------------
- 1 file changed, 132 insertions(+), 47 deletions(-)
+ util/grub-install.c |  178 ++++++++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 131 insertions(+), 47 deletions(-)
 
 Index: b/util/grub-install.c
 ===================================================================
@@ -213,7 +213,7 @@
  	{
  	  char *uuid = NULL;
  	  /*  generic method (used on coreboot and ata mod).  */
-@@ -1857,7 +1890,59 @@ main (int argc, char *argv[])
+@@ -1857,7 +1890,58 @@ main (int argc, char *argv[])
      case GRUB_INSTALL_PLATFORM_IA64_EFI:
        {
  	char *dst = grub_util_path_concat (2, efidir, efi_file);
@@ -221,12 +221,11 @@
 +	if (uefi_secure_boot)
 +	  {
 +	    char *shim_signed = NULL;
-+	    char *mok_signed = NULL, *mok_file = NULL;
++	    char *mok_file = NULL;
 +	    char *config_dst;
 +	    FILE *config_dst_f;
 +
 +	    shim_signed = xasprintf ("/usr/lib/shim/shim%s.efi.signed", efi_suffix);
-+	    mok_signed = xasprintf ("mm%s.efi.signed", efi_suffix);
 +	    mok_file = xasprintf ("mm%s.efi", efi_suffix);
 +
 +	    if (grub_util_is_regular (shim_signed))
@@ -251,7 +250,7 @@
 +		   won't be for older releases); but if we have them, make
 +		   sure they are installed.  */
 +		mok_src = grub_util_path_concat (2, "/usr/lib/shim/",
-+						    mok_signed);
++						    mok_file);
 +		mok_dst = grub_util_path_concat (2, efidir,
 +						    mok_file);
 +		grub_install_copy_file (mok_src,