diff -Nru ocaml-4.08.1/debian/changelog ocaml-4.08.1/debian/changelog
--- ocaml-4.08.1/debian/changelog	2020-01-30 12:11:32.000000000 +0000
+++ ocaml-4.08.1/debian/changelog	2020-02-05 08:59:41.000000000 +0000
@@ -1,3 +1,17 @@
+ocaml (4.08.1-8+rpi1) bullseye-staging; urgency=medium
+
+  [changes brought forward from 4.08.1-4+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Tue, 26 Nov 2019 19:38:59 +0000]
+  * Revert previous raspbian changes, changing the triplet 
+    now seems to cause more problems than it solves (specifically
+    it causes ocaml to try and use nonexistant compilers).
+  * Edit configure.ac to select armv6 when using "arm-linux-gnueabihf"
+  * Partially fix clean target.
+
+  [changes introduced in 4.08.1-5+rpi1 by Peter Michael Green]
+  * Remove gitattributes that cause problems for dgit.
+
+ -- Raspbian forward porter <root@raspbian.org>  Wed, 05 Feb 2020 08:59:41 +0000
+
 ocaml (4.08.1-8) unstable; urgency=medium
 
   * read_main_debug_info: do not die in -custom executables
diff -Nru ocaml-4.08.1/debian/.gitattributes ocaml-4.08.1/debian/.gitattributes
--- ocaml-4.08.1/debian/.gitattributes	2020-01-30 12:11:32.000000000 +0000
+++ ocaml-4.08.1/debian/.gitattributes	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff -Nru ocaml-4.08.1/debian/patches/remove-gitattributes-that-cause-problems.patch ocaml-4.08.1/debian/patches/remove-gitattributes-that-cause-problems.patch
--- ocaml-4.08.1/debian/patches/remove-gitattributes-that-cause-problems.patch	1970-01-01 00:00:00.000000000 +0000
+++ ocaml-4.08.1/debian/patches/remove-gitattributes-that-cause-problems.patch	2020-02-05 08:59:41.000000000 +0000
@@ -0,0 +1,18 @@
+From: Peter Michael Green <plugwash@raspbian.org>
+Date: Sat, 7 Dec 2019 05:28:18 +0000
+X-Dgit-Generated: 4.08.1-5+rpi1 4372289b19cfc4744b8e5c224da3b2f94ff5285d
+Subject: Remove gitattributes that cause problems for dgit.
+
+
+---
+
+--- ocaml-4.08.1.orig/.gitattributes
++++ ocaml-4.08.1/.gitattributes
+@@ -137,7 +137,6 @@ menhir-bench.bash typo.missing-header ty
+ *.check-program-output text eol=lf
+ *.run text eol=lf
+ 
+-/tools/ci/appveyor/appveyor_build.cmd text eol=crlf
+ 
+ configure text eol=lf
+ configure.ac text eol=lf
diff -Nru ocaml-4.08.1/debian/patches/series ocaml-4.08.1/debian/patches/series
--- ocaml-4.08.1/debian/patches/series	2020-01-30 12:11:32.000000000 +0000
+++ ocaml-4.08.1/debian/patches/series	2020-02-05 08:59:41.000000000 +0000
@@ -4,3 +4,5 @@
 0005-Check-for-definition-of-AT_SECURE-before-using-it.patch
 0008-Reimplement-custom-without-hacks.patch
 0006-read_main_debug_info-do-not-die-in-custom-executable.patch
+use-armv6-for-raspbian.patch
+remove-gitattributes-that-cause-problems.patch
diff -Nru ocaml-4.08.1/debian/patches/use-armv6-for-raspbian.patch ocaml-4.08.1/debian/patches/use-armv6-for-raspbian.patch
--- ocaml-4.08.1/debian/patches/use-armv6-for-raspbian.patch	1970-01-01 00:00:00.000000000 +0000
+++ ocaml-4.08.1/debian/patches/use-armv6-for-raspbian.patch	2020-02-05 08:59:41.000000000 +0000
@@ -0,0 +1,14 @@
+Description:  Edit configure.ac to select armv6 when using "arm-linux-gnueabihf"
+Author: Peter Michael Green <plugwash@raspbian.org>
+
+--- ocaml-4.08.1.orig/configure.ac
++++ ocaml-4.08.1/configure.ac
+@@ -871,7 +871,7 @@ AS_CASE([$host],
+   [armv5*-*-linux-gnueabi],
+     [arch=arm; model=armv5; system=linux_eabi],
+   [arm*-*-linux-gnueabihf],
+-    [arch=arm; system=linux_eabihf],
++    [arch=arm; model=armv6; system=linux_eabihf],
+   [arm*-*-linux-gnueabi],
+     [arch=arm; system=linux_eabi],
+   [arm*-*-openbsd*],
diff -Nru ocaml-4.08.1/debian/rules ocaml-4.08.1/debian/rules
--- ocaml-4.08.1/debian/rules	2020-01-30 12:11:32.000000000 +0000
+++ ocaml-4.08.1/debian/rules	2020-02-05 08:59:41.000000000 +0000
@@ -178,6 +178,11 @@
 	done
 # Remaining stuff
 	-rm -Rf debian/$(SRCTARBALL) $(TESTDIR)
+	find testsuite/tests/ -name '*.o' -delete
+	find testsuite/tests/ -name '*.cmx*' -delete
+	find testsuite/tests/ -name '*.cmi' -delete
+	find testsuite/tests/ -name '*.cmo' -delete
+	rm -f Makefile.common Makefile.config config.log config.status libtool runtime/caml/m.h runtime/caml/s.h testsuite/_log
 
 .PHONY: override_dh_auto_install-arch override_dh_auto_install-indep
 override_dh_auto_install-arch: install-stamp-arch