diff -Nru osm2pgsql-0.87.3/debian/changelog osm2pgsql-0.87.3/debian/changelog
--- osm2pgsql-0.87.3/debian/changelog	2015-05-01 09:22:40.000000000 +0000
+++ osm2pgsql-0.87.3/debian/changelog	2015-05-14 20:41:44.000000000 +0000
@@ -1,3 +1,10 @@
+osm2pgsql (0.87.3-3+rpi1) stretch-staging; urgency=medium
+
+  * Also use --without-lockfree configure option on raspbian (and any
+    derivatives thereof) due to build failure.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 14 May 2015 20:41:05 +0000
+
 osm2pgsql (0.87.3-3) unstable; urgency=medium
 
   * Use --without-lockfree configure option on problematic architectures,
diff -Nru osm2pgsql-0.87.3/debian/rules osm2pgsql-0.87.3/debian/rules
--- osm2pgsql-0.87.3/debian/rules	2015-05-01 09:19:36.000000000 +0000
+++ osm2pgsql-0.87.3/debian/rules	2015-05-14 22:05:25.000000000 +0000
@@ -12,7 +12,14 @@
 CFLAGS += $(CPPFLAGS)
 CXXFLAGS += $(CPPFLAGS)
 
-ifneq (,$(findstring $(DEB_HOST_ARCH),"arm64 armel mips mipsel powerpc ppc64el s390x sparc alpha hppa ppc64"))
+NOLOCKFREEARCHES := arm64 armel mips mipsel powerpc ppc64el s390x sparc alpha hppa ppc64
+
+RASPBIANDERIVED:=$(shell dpkg-vendor --derives-from raspbian && echo yes)
+ifeq ($(RASPBIANDERIVED),yes)
+	NOLOCKFREEARCHES += armhf
+endif
+
+ifneq (,$(findstring $(DEB_HOST_ARCH),$(NOLOCKFREEARCHES)))
         CONFIGURE_OPTS += --without-lockfree
 endif