diff -Nru shim-15+1552672080.a4a1fbe/debian/changelog shim-15+1552672080.a4a1fbe/debian/changelog
--- shim-15+1552672080.a4a1fbe/debian/changelog	2019-10-11 20:32:32.000000000 +0000
+++ shim-15+1552672080.a4a1fbe/debian/changelog	2020-03-20 15:19:14.000000000 +0000
@@ -1,3 +1,10 @@
+shim (15+1552672080.a4a1fbe-0ubuntu2) focal; urgency=medium
+
+  * d/patches/fix-path-checks.patch: Cherry-pick upstream fix for regression
+    in loading fwupd, or anything else specified as an argument (LP: #1864223)
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Fri, 20 Mar 2020 16:19:14 +0100
+
 shim (15+1552672080.a4a1fbe-0ubuntu1) eoan; urgency=medium
 
   * New upstream snapshot 15+1552672080.a4a1fbe.
diff -Nru shim-15+1552672080.a4a1fbe/debian/patches/fix-path-checks.patch shim-15+1552672080.a4a1fbe/debian/patches/fix-path-checks.patch
--- shim-15+1552672080.a4a1fbe/debian/patches/fix-path-checks.patch	1970-01-01 00:00:00.000000000 +0000
+++ shim-15+1552672080.a4a1fbe/debian/patches/fix-path-checks.patch	2020-03-20 15:19:14.000000000 +0000
@@ -0,0 +1,23 @@
+From 1870bae796022f8bbf60465352eac329ff1d6ffd Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Thu, 5 Sep 2019 10:36:23 -0400
+Subject: [PATCH] Fix a use of strlen() instead of Strlen()
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+Origin: upstream, https://github.com/rhboot/shim/commit/1870bae796022f8bbf60465352eac329ff1d6ffd
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1864223
+---
+ src/shim.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/shim.c
++++ b/shim.c
+@@ -2148,7 +2148,7 @@ static int is_our_path(EFI_LOADED_IMAGE
+ 
+ 	dprint(L"dppath: %s\n", dppath);
+ 	dprint(L"path:   %s\n", path);
+-	if (StrnCaseCmp(dppath, PathName, strlen(dppath)))
++	if (StrnCaseCmp(dppath, PathName, StrLen(dppath)))
+ 		ret = 0;
+ 
+ done:
diff -Nru shim-15+1552672080.a4a1fbe/debian/patches/series shim-15+1552672080.a4a1fbe/debian/patches/series
--- shim-15+1552672080.a4a1fbe/debian/patches/series	2019-10-02 19:33:33.000000000 +0000
+++ shim-15+1552672080.a4a1fbe/debian/patches/series	2020-03-20 15:19:14.000000000 +0000
@@ -4,3 +4,4 @@
 tpm-correctness-2.patch
 tpm-correctness-3.patch
 MokManager-hidpi-support.patch
+fix-path-checks.patch