diff -Nru kmailtransport-20.04.1/debian/changelog kmailtransport-20.04.1/debian/changelog
--- kmailtransport-20.04.1/debian/changelog	2020-08-20 04:59:26.000000000 +0000
+++ kmailtransport-20.04.1/debian/changelog	2020-08-25 20:10:51.000000000 +0000
@@ -1,3 +1,10 @@
+kmailtransport (20.04.1-2+rpi1) bullseye-staging; urgency=medium
+
+  [changes brought forward from 18.08.1-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 16 Oct 2018 14:10:00 +0000]
+  * Remove armhf from architecture list for libkpimgapi-dev dependency.
+
+ -- Raspbian forward porter <root@raspbian.org>  Tue, 25 Aug 2020 20:10:51 +0000
+
 kmailtransport (20.04.1-2) unstable; urgency=medium
 
   * Team upload.
diff -Nru kmailtransport-20.04.1/debian/control kmailtransport-20.04.1/debian/control
--- kmailtransport-20.04.1/debian/control	2020-08-20 04:50:48.000000000 +0000
+++ kmailtransport-20.04.1/debian/control	2020-08-25 20:10:51.000000000 +0000
@@ -18,7 +18,7 @@
                libkf5mime-dev (>= 20.04.1~),
                libkf5textwidgets-dev (>= 5.68.0~),
                libkf5wallet-dev (>= 5.68.0~),
-               libkpimgapi-dev (>= 20.04.1~) [amd64 arm64 armhf i386 mipsel],
+               libkpimgapi-dev (>= 20.04.1~) [amd64 arm64 i386 mipsel],
                libkpimsmtp-dev (>= 20.04.1~),
                libsasl2-dev,
                libsasl2-modules,