diff -Nru libreoffice-6.0.2/debian/changelog libreoffice-6.0.2/debian/changelog
--- libreoffice-6.0.2/debian/changelog	2018-02-28 17:37:57.000000000 +0000
+++ libreoffice-6.0.2/debian/changelog	2018-03-13 02:30:18.000000000 +0000
@@ -1,3 +1,13 @@
+libreoffice (1:6.0.2-1+rpi1) buster-staging; urgency=medium
+
+  [changes brought forward from 1:5.2.4-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 07 Jan 2017 01:42:16 +0000]
+  * Disable chromium stuff as we don't currently have chromium in the Raspbian
+    repository.
+  [changes introduced in 1:5.4.0-1+rpi1 by Peter Michael Green]
+  * Disable pdfium, it fails to build for armv6
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 13 Mar 2018 02:30:18 +0000
+
 libreoffice (1:6.0.2-1) unstable; urgency=medium
 
   [ Rene Engelhard ]
diff -Nru libreoffice-6.0.2/debian/control libreoffice-6.0.2/debian/control
--- libreoffice-6.0.2/debian/control	2018-02-28 17:37:57.000000000 +0000
+++ libreoffice-6.0.2/debian/control	2018-03-13 02:30:18.000000000 +0000
@@ -11,7 +11,6 @@
                binutils (>= 2.23) [mips mipsel],
                bison,
                bzip2,
-               chromium [amd64 arm64 armhf i386],
                coinor-libcoinmp-dev (>= 1.8.3-2),
                coinor-libcoinutils-dev (>= 2.10.14+repack1-1),
                debhelper (>= 10),
@@ -42,7 +41,6 @@
                imagemagick [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
                java-common (>= 0.49),
                javahelper (>= 0.37~),
-               junit4 (>= 4.8.2-2) [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
                libabw-dev (>= 0.1),
                libarchive-zip-perl [!hppa !ia64 !mips64 !s390 !sparc],
                libavahi-client-dev,
diff -Nru libreoffice-6.0.2/debian/rules libreoffice-6.0.2/debian/rules
--- libreoffice-6.0.2/debian/rules	2018-02-28 17:37:48.000000000 +0000
+++ libreoffice-6.0.2/debian/rules	2018-03-13 02:30:18.000000000 +0000
@@ -581,7 +581,7 @@
 # let's do this only on archs where we have chromium, which is supposedly even only the archs
 # where alsp pdfium is supported. Remove arm64, see
 https://lists.freedesktop.org/archives/libreoffice/2018-February/079384.html
-OOO_PDFIUM_ARCHS := i386 amd64 armhf
+OOO_PDFIUM_ARCHS := i386 amd64
 ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_PDFIUM_ARCHS)))
 ENABLE_PDFIUM=y
 else