diff -Nru ocaml-4.05.0/debian/changelog ocaml-4.05.0/debian/changelog
--- ocaml-4.05.0/debian/changelog	2019-08-06 07:27:23.000000000 +0000
+++ ocaml-4.05.0/debian/changelog	2019-08-18 11:58:49.000000000 +0000
@@ -1,3 +1,7 @@
+ocaml (4.05.0-12+rpi1) bullseye-staging; urgency=medium
+
+ -- Raspbian forward porter <root@raspbian.org>  Sun, 18 Aug 2019 11:58:49 +0000
+
 ocaml (4.05.0-12) unstable; urgency=medium
 
   * Provide libnum-ocaml{,-dev}
@@ -153,6 +157,14 @@
 
  -- Stéphane Glondu <glondu@debian.org>  Thu, 13 Jul 2017 04:40:57 +0200
 
+ocaml (4.02.3-9+rpi1) stretch-staging; urgency=medium
+
+  [changes brought forward from 4.01.0-5+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 24 Jan 2015 10:29:46 +0000]
+  * Add logic in debian/rules to detect raspbian and give the upstream 
+    configure script the correct instructions.
+
+ -- Raspbian forward porter <root@raspbian.org>  Sat, 07 Jan 2017 06:25:05 +0000
+
 ocaml (4.02.3-9) unstable; urgency=medium
 
   * obey hardening LDFLAGS (Closes: #792502). Thanks to Török Edwin
diff -Nru ocaml-4.05.0/debian/.gitattributes ocaml-4.05.0/debian/.gitattributes
--- ocaml-4.05.0/debian/.gitattributes	2019-08-06 07:27:23.000000000 +0000
+++ ocaml-4.05.0/debian/.gitattributes	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff -Nru ocaml-4.05.0/debian/rules ocaml-4.05.0/debian/rules
--- ocaml-4.05.0/debian/rules	2019-08-06 07:27:23.000000000 +0000
+++ ocaml-4.05.0/debian/rules	2019-08-18 11:58:49.000000000 +0000
@@ -53,8 +53,19 @@
 export DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow
 export CCLINKFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
 
-CONFIGURE_OPTS := \
-  --host $(DEB_BUILD_GNU_TYPE)\
+ifeq ($(DEB_BUILD_ARCH),armhf)
+  IS_RASPBIAN := $(shell dpkg-vendor --derives-from Raspbian && echo yes || echo no)
+else
+  IS_RASPBIAN := no
+endif
+
+ifeq ($(IS_RASPBIAN),yes)
+  CONFIGURE_OPTS := --host armv6-unknown-linux-gnueabihf
+else
+  CONFIGURE_OPTS := --host $(DEB_BUILD_GNU_TYPE)
+endif 
+
+CONFIGURE_OPTS += \
   --with-pthread -prefix $(DEB_TEST_BUILD_PREFIX)/usr \
   -libdir $(DEB_TEST_BUILD_PREFIX)$(OCAML_STDLIB_DIR) \
   -x11lib "$(shell pkg-config --variable=libdir x11)" \