diff -Nru libreoffice-6.0.4/debian/changelog libreoffice-6.0.4/debian/changelog
--- libreoffice-6.0.4/debian/changelog	2018-05-07 13:47:22.000000000 +0000
+++ libreoffice-6.0.4/debian/changelog	2018-05-30 22:41:53.000000000 +0000
@@ -1,3 +1,16 @@
+libreoffice (1:6.0.4-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
+
+  [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>  Wed, 30 May 2018 22:41:53 +0000
+
 libreoffice (1:6.0.4-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru libreoffice-6.0.4/debian/control libreoffice-6.0.4/debian/control
--- libreoffice-6.0.4/debian/control	2018-05-07 13:40:37.000000000 +0000
+++ libreoffice-6.0.4/debian/control	2018-05-30 22:41:52.000000000 +0000
@@ -11,11 +11,9 @@
                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),
-               debhelper (>= 10.10.4),
                default-jdk (>= 1:1.6) [!hppa !mips64 !s390 !sparc !i386],
                default-jdk (>= 1:1.7-48) [ia64],
                default-jdk (>= 2:1.7-52.1) [kfreebsd-any],
@@ -24,7 +22,6 @@
                dh-apparmor,
                dh-python,
                dpkg-dev (>= 1.18.2~),
-               dwz,
                firebird-dev (>= 3.0.0.32483.ds4-4) [!hppa !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64],
                firebird3.0-server-core [!hppa !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
                flex (>= 2.3.35),
@@ -35,7 +32,6 @@
                g++ (>= 4:7) [m68k],
                gcc (>= 4:7) [m68k],
                gdb [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
-               ghostscript [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
                gobject-introspection (>= 1.32.0),
                gperf,
                gpg <!nocheck>,
@@ -165,7 +161,6 @@
                maven-repo-helper,
                openjdk-9-jdk (>= 9.0.1+11-1~) [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),
                python3-distutils,
@@ -177,7 +172,6 @@
                zip,
                zlib1g-dev
 Build-Depends-Indep: doxygen (>= 1.8.4) <!nodoc>,
-                     g++-mingw-w64-i686,
                      gettext,
                      libbsh-java,
                      rdfind,
diff -Nru libreoffice-6.0.4/debian/rules libreoffice-6.0.4/debian/rules
--- libreoffice-6.0.4/debian/rules	2018-05-07 13:40:37.000000000 +0000
+++ libreoffice-6.0.4/debian/rules	2018-05-30 22:41:52.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
@@ -492,7 +494,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