diff -Nru util-linux-2.36.1/debian/changelog util-linux-2.36.1/debian/changelog
--- util-linux-2.36.1/debian/changelog	2021-08-11 23:43:10.000000000 +0200
+++ util-linux-2.36.1/debian/changelog	2021-09-23 16:07:01.000000000 +0200
@@ -1,3 +1,9 @@
+util-linux (2.36.1-8ubuntu2) impish; urgency=medium
+
+  * include: Rename HiFive partition UUIDs (LP: #1944741)
+
+ -- Alexandre Ghiti <alexandre.ghiti@canonical.com>  Thu, 23 Sep 2021 16:07:01 +0200
+
 util-linux (2.36.1-8ubuntu1) impish; urgency=medium
 
   * Merge from Debian unstable. Remaining changes:
diff -Nru util-linux-2.36.1/debian/patches/hifive-guid-names.patch util-linux-2.36.1/debian/patches/hifive-guid-names.patch
--- util-linux-2.36.1/debian/patches/hifive-guid-names.patch	1970-01-01 01:00:00.000000000 +0100
+++ util-linux-2.36.1/debian/patches/hifive-guid-names.patch	2021-09-23 16:06:46.000000000 +0200
@@ -0,0 +1,25 @@
+Description: Rename HiFive partition UUIDs 
+Both HiFive Unleashed and HiFive Unmatched bootloaders seek for the same         
+UUIDs to load the next stage bootloader: the current name makes partitions       
+on Unmatched board appear as 'Unleashed'.                                        
+                                                                                 
+Fix that by removing the 'Unleashed' part of the current name so that it         
+fits both.
+Author: Alexandre Ghiti <alexandre.ghiti@canonical.com> 
+Origin: upstream, https://github.com/karelzak/util-linux/commit/10fd91d389497d8be435cc66abbdeb2eb6ea2f07 
+Applied-Upstream: https://github.com/karelzak/util-linux/commit/10fd91d389497d8be435cc66abbdeb2eb6ea2f07 
+Last-Update: 2021-09-23
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/include/pt-gpt-partnames.h
++++ b/include/pt-gpt-partnames.h
+@@ -165,6 +165,6 @@
+ /* Plan 9 */
+ DEF_GUID("C91818F9-8025-47AF-89D2-F030D7000C2C", N_("Plan 9 partition")),
+ 
+-/* HiFive Unleased bootloaders */
+-DEF_GUID("5B193300-FC78-40CD-8002-E86C45580B47", N_("HiFive Unleashed FSBL")),
+-DEF_GUID("2E54B353-1271-4842-806F-E436D6AF6985", N_("HiFive Unleashed BBL")),
++/* HiFive bootloaders */
++DEF_GUID("5B193300-FC78-40CD-8002-E86C45580B47", N_("HiFive FSBL")),
++DEF_GUID("2E54B353-1271-4842-806F-E436D6AF6985", N_("HiFive BBL")),
diff -Nru util-linux-2.36.1/debian/patches/series util-linux-2.36.1/debian/patches/series
--- util-linux-2.36.1/debian/patches/series	2021-08-11 23:42:55.000000000 +0200
+++ util-linux-2.36.1/debian/patches/series	2021-09-23 16:02:06.000000000 +0200
@@ -9,3 +9,4 @@
 upstream/libmount-do-not-canonicalize-ZFS-source-dataset.patch
 upstream/libmount-allow-read-only-for-not-root-users.patch
 upstream/CVE-2021-37600-sys-utils-ipcutils-be-careful-when-call-calloc.patch
+hifive-guid-names.patch