diff -Nru kmailtransport-18.08.3/debian/changelog kmailtransport-18.08.3/debian/changelog
--- kmailtransport-18.08.3/debian/changelog	2019-11-14 22:50:15.000000000 +0000
+++ kmailtransport-18.08.3/debian/changelog	2019-11-21 01:34:18.000000000 +0000
@@ -1,3 +1,10 @@
+kmailtransport (18.08.3-4+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>  Thu, 21 Nov 2019 01:34:18 +0000
+
 kmailtransport (18.08.3-4) unstable; urgency=medium
 
   * Release to unstable.
diff -Nru kmailtransport-18.08.3/debian/control kmailtransport-18.08.3/debian/control
--- kmailtransport-18.08.3/debian/control	2019-11-14 22:33:25.000000000 +0000
+++ kmailtransport-18.08.3/debian/control	2019-11-21 01:34:18.000000000 +0000
@@ -17,7 +17,7 @@
                libkf5mime-dev (>> 18.08.3-1),
                libkf5textwidgets-dev (>= 5.47.0~),
                libkf5wallet-dev (>= 5.47.0~),
-               libkpimgapi-dev (>> 18.08.3-2) [amd64 arm64 armhf i386 mipsel],
+               libkpimgapi-dev (>> 18.08.3-2) [amd64 arm64 i386 mipsel],
                libkpimsmtp-dev (>> 18.08.3-1),
                libsasl2-dev,
                libsasl2-modules,