diff -Nru 389-ds-base-1.4.0.20/debian/changelog 389-ds-base-1.4.0.20/debian/changelog
--- 389-ds-base-1.4.0.20/debian/changelog	2019-01-16 09:30:51.000000000 +0000
+++ 389-ds-base-1.4.0.20/debian/changelog	2019-01-18 13:51:34.000000000 +0000
@@ -1,3 +1,10 @@
+389-ds-base (1.4.0.20-3+rpi1) buster-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>  Fri, 18 Jan 2019 13:51:34 +0000
+
 389-ds-base (1.4.0.20-3) unstable; urgency=medium
 
   * control: 389-ds-base should depend on the legacy tools for now.
diff -Nru 389-ds-base-1.4.0.20/debian/rules 389-ds-base-1.4.0.20/debian/rules
--- 389-ds-base-1.4.0.20/debian/rules	2019-01-13 00:12:43.000000000 +0000
+++ 389-ds-base-1.4.0.20/debian/rules	2019-01-18 13:51:34.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