diff -Nru kmailtransport-20.08.2/debian/changelog kmailtransport-20.08.2/debian/changelog
--- kmailtransport-20.08.2/debian/changelog	2020-10-19 22:08:25.000000000 +0000
+++ kmailtransport-20.08.2/debian/changelog	2020-10-28 23:52:15.000000000 +0000
@@ -1,3 +1,10 @@
+kmailtransport (20.08.2-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>  Wed, 28 Oct 2020 23:52:15 +0000
+
 kmailtransport (20.08.2-2) unstable; urgency=medium
 
   * Team upload to unstable.
diff -Nru kmailtransport-20.08.2/debian/control kmailtransport-20.08.2/debian/control
--- kmailtransport-20.08.2/debian/control	2020-10-19 21:54:02.000000000 +0000
+++ kmailtransport-20.08.2/debian/control	2020-10-28 23:52:15.000000000 +0000
@@ -18,7 +18,7 @@
                libkf5mime-dev (>= 20.08.2~),
                libkf5textwidgets-dev (>= 5.71.0~),
                libkf5wallet-dev (>= 5.71.0~),
-               libkpimgapi-dev (>= 20.08.2~) [amd64 arm64 armhf i386 mipsel],
+               libkpimgapi-dev (>= 20.08.2~) [amd64 arm64 i386 mipsel],
                libkpimsmtp-dev (>= 20.08.2~),
                libsasl2-dev,
                libsasl2-modules,