diff -Nru libreoffice-6.4.2/debian/changelog libreoffice-6.4.2/debian/changelog
--- libreoffice-6.4.2/debian/changelog	2020-03-28 05:53:24.000000000 +0000
+++ libreoffice-6.4.2/debian/changelog	2020-04-03 12:38:50.000000000 +0000
@@ -1,3 +1,13 @@
+libreoffice (1:6.4.2-3+rpi1) bullseye-staging; urgency=medium
+
+  [changes introduced in 1:5.4.0-1+rpi1 by Peter Michael Green]
+  * Disable pdfium, it fails to build for armv6
+
+  [changes brought forward from 1:6.0.2-1+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Fri, 27 Apr 2018 02:14:18 +0000]
+  * Disable testsuite.
+
+ -- Raspbian forward porter <root@raspbian.org>  Fri, 03 Apr 2020 12:38:50 +0000
+
 libreoffice (1:6.4.2-3) unstable; urgency=medium
 
   [ Rene Engelhard ]
diff -Nru libreoffice-6.4.2/debian/rules libreoffice-6.4.2/debian/rules
--- libreoffice-6.4.2/debian/rules	2020-03-28 05:53:16.000000000 +0000
+++ libreoffice-6.4.2/debian/rules	2020-04-03 12:38:50.000000000 +0000
@@ -15,6 +15,8 @@
 # /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
 ################################################################################
 
+export DEB_BUILD_OPTIONS += nocheck
+
 vafilt = $(subst $(2)=,,$(filter $(2)=%,$(1)))
 
 include /usr/share/dpkg/pkg-info.mk
@@ -486,7 +488,7 @@
 
 # let's do this only on archs where we have chromium, which is supposedly even only the archs
 # where alsp pdfium is supported.
-OOO_PDFIUM_ARCHS := i386 amd64 armhf arm64
+OOO_PDFIUM_ARCHS := i386 amd64 arm64
 ifneq (,$(filter $(DEB_HOST_ARCH),$(OOO_PDFIUM_ARCHS)))
 ENABLE_PDFIUM=y
 else