diff -Nru ocaml-4.13.1/debian/changelog ocaml-4.13.1/debian/changelog
--- ocaml-4.13.1/debian/changelog	2022-01-19 10:14:42.000000000 +0000
+++ ocaml-4.13.1/debian/changelog	2022-02-03 18:25:38.000000000 +0000
@@ -1,3 +1,17 @@
+ocaml (4.13.1-3+rpi1) bookworm-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.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 03 Feb 2022 18:25:38 +0000
+
 ocaml (4.13.1-3) unstable; urgency=medium
 
   * Upload to unstable
diff -Nru ocaml-4.13.1/debian/.gitattributes ocaml-4.13.1/debian/.gitattributes
--- ocaml-4.13.1/debian/.gitattributes	2022-01-19 10:14:42.000000000 +0000
+++ ocaml-4.13.1/debian/.gitattributes	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff -Nru ocaml-4.13.1/debian/patches/remove-gitattributes-that-cause-problems.patch ocaml-4.13.1/debian/patches/remove-gitattributes-that-cause-problems.patch
--- ocaml-4.13.1/debian/patches/remove-gitattributes-that-cause-problems.patch	1970-01-01 00:00:00.000000000 +0000
+++ ocaml-4.13.1/debian/patches/remove-gitattributes-that-cause-problems.patch	2022-02-03 18:25:38.000000000 +0000
@@ -0,0 +1,15 @@
+From: Peter Michael Green <plugwash@raspbian.org>
+Subject: Remove gitattributes that cause problems for dgit.
+
+diff --git a/.gitattributes b/.gitattributes
+index 956d2136..a278ffe0 100644
+--- a/.gitattributes
++++ b/.gitattributes
+@@ -151,7 +151,6 @@ menhir-bench.bash typo.missing-header typo.utf8
+ *.check-program-output text eol=lf
+ *.run text eol=lf
+ 
+-/tools/ci/appveyor/appveyor_build.cmd text eol=crlf
+ 
+ aclocal.m4 typo.tab
+ configure.ac text eol=lf
diff -Nru ocaml-4.13.1/debian/patches/series ocaml-4.13.1/debian/patches/series
--- ocaml-4.13.1/debian/patches/series	2022-01-19 10:14:42.000000000 +0000
+++ ocaml-4.13.1/debian/patches/series	2022-02-03 18:25:38.000000000 +0000
@@ -5,3 +5,5 @@
 0005-Trigger-output-complete-exe-on-custom-with-an-enviro.patch
 0006-Do-not-error-on-warnings-in-autoconf.patch
 0007-Put-manpages-in-section-3o-instead-of-3.patch
+use-armv6-for-raspbian.patch
+remove-gitattributes-that-cause-problems.patch
diff -Nru ocaml-4.13.1/debian/patches/use-armv6-for-raspbian.patch ocaml-4.13.1/debian/patches/use-armv6-for-raspbian.patch
--- ocaml-4.13.1/debian/patches/use-armv6-for-raspbian.patch	1970-01-01 00:00:00.000000000 +0000
+++ ocaml-4.13.1/debian/patches/use-armv6-for-raspbian.patch	2022-02-03 18:25:38.000000000 +0000
@@ -0,0 +1,16 @@
+Description:  Edit configure.ac to select armv6 when using "arm-linux-gnueabihf"
+Author: Peter Michael Green <plugwash@raspbian.org>
+
+diff --git a/configure.ac b/configure.ac
+index 9ac019f7..03f0fd95 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1092,7 +1092,7 @@ AS_CASE([$host],
+   [armv5*-*-linux-*eabi],
+     [arch=arm; model=armv5; system=linux_eabi],
+   [arm*-*-linux-*eabihf],
+-    [arch=arm; system=linux_eabihf],
++    [arch=arm; model=armv6; system=linux_eabihf],
+   [arm*-*-linux-*eabi],
+     [arch=arm; system=linux_eabi],
+   [arm*-*-openbsd*],
diff -Nru ocaml-4.13.1/debian/rules ocaml-4.13.1/debian/rules
--- ocaml-4.13.1/debian/rules	2022-01-19 10:14:42.000000000 +0000
+++ ocaml-4.13.1/debian/rules	2022-02-03 18:25:38.000000000 +0000
@@ -180,6 +180,10 @@
 	done
 # Remaining stuff
 	-rm -Rf debian/$(SRCTARBALL) $(TESTDIR)
+	find testsuite/tests/ -name '*.o' -delete
+	find testsuite/tests/ -name '*.cmx*' -delete
+	find testsuite/tests/ -name '*.cmo' -delete
+	rm -f 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