diff -Nru kmailtransport-21.08.1/debian/changelog kmailtransport-21.08.1/debian/changelog
--- kmailtransport-21.08.1/debian/changelog	2021-09-10 22:22:58.000000000 +0000
+++ kmailtransport-21.08.1/debian/changelog	2021-09-29 02:39:37.000000000 +0000
@@ -1,3 +1,10 @@
+kmailtransport (21.08.1-1+rpi1) bookworm-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, 29 Sep 2021 02:39:37 +0000
+
 kmailtransport (21.08.1-1) unstable; urgency=medium
 
   [ Norbert Preining ]
diff -Nru kmailtransport-21.08.1/debian/control kmailtransport-21.08.1/debian/control
--- kmailtransport-21.08.1/debian/control	2021-09-10 22:22:57.000000000 +0000
+++ kmailtransport-21.08.1/debian/control	2021-09-29 02:39:37.000000000 +0000
@@ -20,7 +20,7 @@
                libkf5service-dev (>= 5.79.0~),
                libkf5textwidgets-dev (>= 5.83.0~),
                libkf5wallet-dev (>= 5.83.0~),
-               libkpimgapi-dev (>= 21.08.1~) [amd64 arm64 armhf i386 mipsel],
+               libkpimgapi-dev (>= 21.08.1~) [amd64 arm64 i386 mipsel],
                libkpimsmtp-dev (>= 21.08.1~),
                libsasl2-dev,
                libsasl2-modules,