diff -Nru u-boot-2021.01+dfsg/debian/changelog u-boot-2021.01+dfsg/debian/changelog
--- u-boot-2021.01+dfsg/debian/changelog	2021-06-25 18:21:47.000000000 +0000
+++ u-boot-2021.01+dfsg/debian/changelog	2021-07-30 14:38:17.000000000 +0000
@@ -1,3 +1,21 @@
+u-boot (2021.01+dfsg-3ubuntu0~20.04.3) focal; urgency=medium
+
+  * debian/u-boot-sifive.postinst: use correct target names for u-boot
+    2021.01.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Fri, 30 Jul 2021 16:38:17 +0200
+
+u-boot (2021.01+dfsg-3ubuntu0~20.04.2) focal; urgency=medium
+
+  * Bump opensbi build-dependency to ensure fixed version is used by u-boot
+    RISC-V images (LP: #1937277)
+
+  [ Dimitri John Ledkov ]
+  * Implement u-boot-sifive.postinst to upgrade u-boot in loader1/loader2
+    partitions upon package upgrades. LP: #1936370
+
+ -- Dave Jones <dave.jones@canonical.com>  Thu, 29 Jul 2021 14:00:10 +0100
+
 u-boot (2021.01+dfsg-3ubuntu0~20.04.1) focal; urgency=medium
 
   * SRU of 2021.01+dfsg-3 from hirsute to enable booting on HiFive Unmatched
diff -Nru u-boot-2021.01+dfsg/debian/control u-boot-2021.01+dfsg/debian/control
--- u-boot-2021.01+dfsg/debian/control	2021-06-25 18:21:47.000000000 +0000
+++ u-boot-2021.01+dfsg/debian/control	2021-07-29 12:56:43.000000000 +0000
@@ -16,7 +16,7 @@
  libc6:armhf [armhf] <cross !pkg.uboot.notools>,
  libc6:armel [armel] <cross !pkg.uboot.notools>,
  libc6:riscv64 [riscv64] <cross !pkg.uboot.notools>,
- opensbi (>= 0.8-1~),
+ opensbi (>= 0.9-1~),
  libpython3-dev:native [linux-any],
  libssl-dev,
  python3:any [linux-any],
diff -Nru u-boot-2021.01+dfsg/debian/u-boot-sifive.postinst u-boot-2021.01+dfsg/debian/u-boot-sifive.postinst
--- u-boot-2021.01+dfsg/debian/u-boot-sifive.postinst	1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2021.01+dfsg/debian/u-boot-sifive.postinst	2021-07-30 14:37:28.000000000 +0000
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+##DEBHELPER##
+
+set -e
+
+case "$1" in
+    configure)
+        target=""
+        if grep -q '^SiFive HiFive Unleashed A00$' /sys/firmware/devicetree/base/model; then
+            target="sifive_fu540"
+        fi
+        if grep -q '^SiFive HiFive Unmatched A00$' /sys/firmware/devicetree/base/model; then
+            target="sifive_hifive_unmatched_fu740"
+        fi
+        if [ -n "$target" ] && [ -e /dev/disk/by-partlabel/loader1 ] && [ -e /dev/disk/by-partlabel/loader2 ]; then
+            dd if=/usr/lib/u-boot/$target/u-boot-spl.bin of=/dev/disk/by-partlabel/loader1
+            dd if=/usr/lib/u-boot/$target/u-boot.itb of=/dev/disk/by-partlabel/loader2
+        fi
+        ;;
+esac
+
+exit 0