diff -Nru 389-ds-base-1.4.0.22/debian/changelog 389-ds-base-1.4.0.22/debian/changelog
--- 389-ds-base-1.4.0.22/debian/changelog	2019-04-05 21:32:06.000000000 +0000
+++ 389-ds-base-1.4.0.22/debian/changelog	2019-07-11 17:33:27.000000000 +0000
@@ -1,3 +1,10 @@
+389-ds-base (1.4.0.22-1+rpi1) bullseye-staging; urgency=medium
+
+  [changes brought forward from 1.4.0.19-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 27 Dec 2018 01:27:25 +0000]
+  * Add -latomic to LDFLAGS on armhf too.
+
+ -- Raspbian forward porter <root@raspbian.org>  Thu, 11 Jul 2019 17:33:27 +0000
+
 389-ds-base (1.4.0.22-1) unstable; urgency=medium
 
   * New upstream bugfix release.
diff -Nru 389-ds-base-1.4.0.22/debian/rules 389-ds-base-1.4.0.22/debian/rules
--- 389-ds-base-1.4.0.22/debian/rules	2019-04-03 06:44:05.000000000 +0000
+++ 389-ds-base-1.4.0.22/debian/rules	2019-07-11 17:33:27.000000000 +0000
@@ -4,7 +4,7 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+pie
 
 
-ifneq (,$(filter $(DEB_HOST_ARCH), armel m68k mips mipsel powerpc powerpcspe sh4))
+ifneq (,$(filter $(DEB_HOST_ARCH), armhf armel m68k mips mipsel powerpc powerpcspe sh4))
   export DEB_LDFLAGS_MAINT_APPEND=-latomic
 endif