diff -Nru libreoffice-5.4.2/debian/changelog libreoffice-5.4.2/debian/changelog
--- libreoffice-5.4.2/debian/changelog	2017-10-10 19:28:41.000000000 +0000
+++ libreoffice-5.4.2/debian/changelog	2017-10-26 15:10:59.000000000 +0000
@@ -1,3 +1,13 @@
+libreoffice (1:5.4.2-3+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 <pluywash@raspbian.org>  Thu, 26 Oct 2017 15:10:59 +0000
+
 libreoffice (1:5.4.2-3) unstable; urgency=medium
 
   * debian/patches/ww8export-HAVE_MORE_FONTS.diff, debian/rules: revert
diff -Nru libreoffice-5.4.2/debian/control libreoffice-5.4.2/debian/control
--- libreoffice-5.4.2/debian/control	2017-10-10 19:28:41.000000000 +0000
+++ libreoffice-5.4.2/debian/control	2017-10-26 15:10:59.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),
@@ -40,7 +39,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,
@@ -57,7 +55,6 @@
                libcdr-dev (>= 0.1),
                libclucene-dev (>= 2.3.3.4-4.1),
                libcmis-dev (>= 0.5.0-3),
-               libcollada2gltfconvert-dev (>= 20140924-2)[amd64 i386],
                libcppunit-dev (>= 1.14) [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
                libcups2-dev,
                libcurl4-gnutls-dev,
@@ -108,11 +105,9 @@
                libneon27-gnutls-dev,
                libnspr4-dev,
                libnss3-dev (>= 3.12.3),
-               libo3dgc-dev (>= 0~20131011-2) [amd64 i386],
                libodfgen-dev (>= 0.1),
                liborcus-dev (>= 0.12),
                libpagemaker-dev,
-               libpcre3-dev [amd64 i386],
                libpng-dev,
                libpoppler-cpp-dev,
                libpoppler-dev (>= 0.12.0),
@@ -148,12 +143,10 @@
                locales [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
                lp-solve (>= 5.5.0.13-5+b1),
                maven-repo-helper,
-               opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg1-2) [amd64 i386],
                pkg-config,
                pstoedit [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
                python3,
                python3-dev (>= 3.3),
-               rapidjson-dev [amd64 i386],
                ucpp,
                unixodbc-dev (>= 2.2.11),
                unzip,
@@ -162,7 +155,6 @@
                zip,
                zlib1g-dev
 Build-Depends-Indep: doxygen (>= 1.8.4) <!nodoc>,
-                     g++-mingw-w64-i686,
                      libbase-java [!hppa !ia64 !mips64 !s390 !sparc],
                      libbsh-java,
                      libcommons-logging-java [!hppa !ia64 !mips64 !s390 !sparc],
diff -Nru libreoffice-5.4.2/debian/rules libreoffice-5.4.2/debian/rules
--- libreoffice-5.4.2/debian/rules	2017-10-10 19:27:42.000000000 +0000
+++ libreoffice-5.4.2/debian/rules	2017-10-26 15:10:59.000000000 +0000
@@ -562,7 +562,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 (,$(findstring $(DEB_HOST_ARCH),$(OOO_PDFIUM_ARCHS)))
 ENABLE_PDFIUM=y
 else