diff --git a/shim-bsc1174512-correct-license-in-headers.patch b/shim-bsc1174512-correct-license-in-headers.patch
new file mode 100644
index 0000000..f265ab1
--- /dev/null
+++ b/shim-bsc1174512-correct-license-in-headers.patch
@@ -0,0 +1,46 @@
+From 248e327146daf008b32615423f86d0a985d9d519 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Thu, 9 Jul 2020 00:24:57 -0400
+Subject: [PATCH] Remove a couple of incorrect license claims.
+
+A certain someone's default editor template leaked in to a couple of
+source files, and claims they're GPL licensed.  They're not.
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+(cherry picked from commit 476cbff111001d01a5a27dc2289fc7cd2d34c38e)
+---
+ errlog.c | 3 ---
+ mok.c    | 2 --
+ 2 files changed, 5 deletions(-)
+
+diff --git a/errlog.c b/errlog.c
+index 18be482..e2ac04a 100644
+--- a/errlog.c
++++ b/errlog.c
+@@ -1,10 +1,7 @@
+ /*
+  * errlog.c
+  * Copyright 2017 Peter Jones <pjones@redhat.com>
+- *
+- * Distributed under terms of the GPLv3 license.
+  */
+-
+ #include "shim.h"
+ 
+ static CHAR16 **errs = NULL;
+diff --git a/mok.c b/mok.c
+index 0bcab32..9498440 100644
+--- a/mok.c
++++ b/mok.c
+@@ -1,8 +1,6 @@
+ /*
+  * mok.c
+  * Copyright 2017 Peter Jones <pjones@redhat.com>
+- *
+- * Distributed under terms of the GPLv3 license.
+  */
+ 
+ #include "shim.h"
+-- 
+2.27.0
+
diff --git a/shim-correct-license-in-headers.patch b/shim-correct-license-in-headers.patch
deleted file mode 100644
index 97f4436..0000000
--- a/shim-correct-license-in-headers.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 64492acf8b1d72cea0c3e203887bfe26fb840f1d Mon Sep 17 00:00:00 2001
-From: Gary Lin <glin@suse.com>
-Date: Thu, 13 Dec 2018 17:19:36 +0800
-Subject: [PATCH] Add the license change statement for errlog.c and mok.c
-
----
- errlog.c | 6 ++++++
- mok.c    | 6 ++++++
- 2 files changed, 12 insertions(+)
-
-diff --git a/errlog.c b/errlog.c
-index 18be482..4a1fffb 100644
---- a/errlog.c
-+++ b/errlog.c
-@@ -3,6 +3,12 @@
-  * Copyright 2017 Peter Jones <pjones@redhat.com>
-  *
-  * Distributed under terms of the GPLv3 license.
-+ *
-+ * As Peter stated in issues#155:
-+ * "I'll publicly state here that as the author of those files, you can
-+ *  treat them as dual-licensed with the GPLv3 text that accidentally
-+ *  made it in and the BSD license they should have borne."
-+ * Ref: https://github.com/rhboot/shim/issues/155#issuecomment-443738252
-  */
- 
- #include "shim.h"
-diff --git a/mok.c b/mok.c
-index 3867521..903b3b4 100644
---- a/mok.c
-+++ b/mok.c
-@@ -3,6 +3,12 @@
-  * Copyright 2017 Peter Jones <pjones@redhat.com>
-  *
-  * Distributed under terms of the GPLv3 license.
-+ *
-+ * As Peter stated in issues#155:
-+ * "I'll publicly state here that as the author of those files, you can
-+ *  treat them as dual-licensed with the GPLv3 text that accidentally
-+ *  made it in and the BSD license they should have borne."
-+ * Ref: https://github.com/rhboot/shim/issues/155#issuecomment-443738252
-  */
- 
- #include "shim.h"
--- 
-2.19.2
-
diff --git a/shim.changes b/shim.changes
index ed4d9c9..457fff7 100644
--- a/shim.changes
+++ b/shim.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jul 27 07:26:03 UTC 2020 - Gary Ching-Pang Lin <glin@suse.com>
+
+- Replace shim-correct-license-in-headers.patch with the upstream
+  commit: shim-bsc1174512-correct-license-in-headers.patch
+  (bsc#1174512)
+
 -------------------------------------------------------------------
 Wed Jul 22 09:23:02 UTC 2020 - Gary Ching-Pang Lin <glin@suse.com>
 
diff --git a/shim.spec b/shim.spec
index fb28acf..5bbebd8 100644
--- a/shim.spec
+++ b/shim.spec
@@ -70,7 +70,8 @@ Patch2:         shim-change-debug-file-path.patch
 Patch3:         shim-bsc1092000-fallback-menu.patch
 # PATCH-FIX-UPSTREAM shim-always-mirror-mok-variables.patch glin@suse.com -- Mirror MOK variables correctly
 Patch4:         shim-always-mirror-mok-variables.patch
-Patch5:         shim-correct-license-in-headers.patch
+# PATCH-FIX-UPSTREAM shim-bsc1174512-correct-license-in-headers.patch glin@suse.com -- Fix the license header in errlog.c and mok.c
+Patch5:         shim-bsc1174512-correct-license-in-headers.patch
 # PATCH-FIX-UPSTREAM gcc9-fix-warnings.patch mliska@suse.cz -- MokManager: Use CompareMem on MokListNode.Type instead of CompareGuid 
 Patch6:         gcc9-fix-warnings.patch
 # PATCH-FIX-OPENSUSE shim-fix-gnu-efi-3.0.11.patch glin@suse.com -- Fix the build error caused by the typo fix in gnu-efi 3.0.11