diff -Nru ghc-8.8.4/debian/changelog ghc-8.8.4/debian/changelog
--- ghc-8.8.4/debian/changelog	2020-08-11 14:12:43.000000000 +0000
+++ ghc-8.8.4/debian/changelog	2020-10-17 14:42:05.000000000 +0000
@@ -1,3 +1,12 @@
+ghc (8.8.4-1+rpi1) bullseye-staging; urgency=medium
+
+  [changes brought forward from 7.6.3-21+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 19 Apr 2015 14:00:16 +0000]
+  * Change compiler defaults for armv6
+  [changed introduced in 7.10.3-2+rpi1 by Peter Michael Green]
+  * Add call to dh_autoreconf_clean
+
+ -- Raspbian forward porter <root@raspbian.org>  Sat, 17 Oct 2020 14:42:05 +0000
+
 ghc (8.8.4-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru ghc-8.8.4/debian/patches/ARM-VFPv3D16 ghc-8.8.4/debian/patches/ARM-VFPv3D16
--- ghc-8.8.4/debian/patches/ARM-VFPv3D16	2020-08-11 14:12:43.000000000 +0000
+++ ghc-8.8.4/debian/patches/ARM-VFPv3D16	2020-10-17 14:42:05.000000000 +0000
@@ -13,9 +13,10 @@
 @@ -454,7 +454,7 @@ AC_DEFUN([GET_ARM_ISA],
                  )],
                  [changequote(, )dnl
-                  ARM_ISA=ARMv7
+-                 ARM_ISA=ARMv7
++                 ARM_ISA=ARMv6
 -                 ARM_ISA_EXT="[VFPv3,NEON]"
-+                 ARM_ISA_EXT="[VFPv3D16,NEON]"
++                 ARM_ISA_EXT="[VFPv2]"
                   changequote([, ])dnl
                  ])
          ])
diff -Nru ghc-8.8.4/debian/rules ghc-8.8.4/debian/rules
--- ghc-8.8.4/debian/rules	2020-05-28 14:01:41.000000000 +0000
+++ ghc-8.8.4/debian/rules	2020-10-17 14:42:05.000000000 +0000
@@ -290,6 +290,8 @@
 	rm -f utils/ghc-pwd/dist-boot/Main.o
 	rm -f utils/ghc-pwd/dist-boot/ghc-pwd
 
+	dh_autoreconf_clean
+
 	rm -f libraries/haskeline/a.out
 	rm -rf utils/ghctags/dist-install