diff --git c/editors/libreoffice/Makefile i/editors/libreoffice/Makefile
index 9fc6cf01493f..677c4a33da54 100644
--- c/editors/libreoffice/Makefile
+++ i/editors/libreoffice/Makefile
@@ -2,7 +2,6 @@
 
 .include "${.CURDIR}/Makefile.common"
 
-PORTREVISION=	4
 MASTER_SITES=	http://download.documentfoundation.org/libreoffice/src/${PORTVERSION}/ \
 		http://dev-www.libreoffice.org/src/:src \
 		http://dev-www.libreoffice.org/extern/:ext
@@ -63,12 +62,14 @@ LIB_DEPENDS=	libapr-1.so:devel/apr1 \
 		libexttextcat-2.0.so:textproc/libexttextcat \
 		libmwaw-0.3.so:textproc/libmwaw03 \
 		libodfgen-0.1.so:textproc/libodfgen01 \
+		libepubgen-0.1.so:textproc/libepubgen01 \
 		librevenge-0.0.so:textproc/librevenge \
 		libstaroffice-0.0.so:textproc/libstaroffice \
 		libvisio-0.1.so:textproc/libvisio01 \
 		libwpd-0.10.so:textproc/libwpd010 \
 		libwps-0.4.so:textproc/libwps \
 		libxml2.so:textproc/libxml2 \
+		libxmlsec1-nss.so:security/xmlsec1 \
 		libxslt.so:textproc/libxslt \
 		libmythes-1.2.so:textproc/mythes \
 		librdf.so:textproc/redland \
@@ -83,8 +84,8 @@ RUN_DEPENDS=	xdg-open:devel/xdg-utils \
 		${LOCALBASE}/share/fonts/LinLibertineG/LinLibertine_DR_G.ttf:x11-fonts/linuxlibertine-g
 
 DISTFILES+=	4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2:src \
-		86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz:src \
-		cppunit-1.13.2.tar.gz:src
+		cppunit-1.14.0.tar.gz:src
+#		pdfium-3312.tar.bz2:src
 
 NOT_FOR_ARCHS=		aarch64 armv6 armv7
 NOT_FOR_ARCHS_REASON=	Unsupported host_cpu
@@ -95,7 +96,7 @@ MASTER_SITES+=	http://dev-builds.libreoffice.org/pre-releases/src/
 
 CONFLICTS_INSTALL=	libreoffice4-4.*
 
-INSTALL_TARGET=	distro-pack-install-strip
+INSTALL_TARGET=	distro-pack-install
 WRKSRC=		${WRKDIR}/${PORTNAME}-${LOVERSION}
 
 GNU_CONFIGURE=	yes
@@ -109,9 +110,10 @@ USES=		autoreconf:build bison compiler:c++11-lib cpe gmake jpeg \
 
 OPTIONS_DEFINE=	CUPS GNOME GTK2 GTK3 JAVA KDE4 MMEDIA PGSQL SDK SYSTRAY \
 		TEST WEBDAV
-OPTIONS_DEFAULT=	CUPS GTK2 MMEDIA
+OPTIONS_DEFAULT=	CUPS GTK3 MMEDIA
 
-GTK3_DESC=	GTK+ 3 GUI toolkit support (experimental)
+GTK2_DESC=	GTK+ 2 GUI toolkit support
+GTK3_DESC=	GTK+ 3 GUI toolkit support
 JAVA_DESC=	Add Java support (XML filters, macros)
 MMEDIA_DESC=	Enable multimedia backend for impress
 PGSQL_DESC=	Build with PostgreSQL-SDBC driver
@@ -227,9 +229,9 @@ CONFIGURE_ARGS=	--disable-dependency-tracking \
 		--disable-mergelibs \
 		--disable-online-update \
 		--enable-cairo-canvas \
-		--enable-graphite \
 		--enable-python=system \
 		--enable-release-build \
+		--disable-pdfium \
 		--exec-prefix=${PREFIX} \
 		--with-alloc=system \
 		--with-boost=${LOCALBASE} \
@@ -311,7 +313,7 @@ post-install:
 	    -exec ${ECHO_CMD} "@dir {}" \; >> ${TMPPLIST}
 	@cd ${STAGEDIR}${PREFIX} && \
 	${FIND} -s bin lib man -not -type d >> ${TMPPLIST}
-.for subdir in appdata application-registry applications bash-completion icons mime mime-info mimelnk
+.for subdir in appdata application-registry applications bash-completion icons mime mime-info
 	@cd ${STAGEDIR}${PREFIX} && \
 	${FIND} -s share/${subdir} -not -type d >> ${TMPPLIST}
 .endfor
diff --git c/editors/libreoffice/Makefile.common i/editors/libreoffice/Makefile.common
index 240157b1d39c..29ef03eee768 100644
--- c/editors/libreoffice/Makefile.common
+++ i/editors/libreoffice/Makefile.common
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libreoffice
-PORTVERSION=	5.3.7
+PORTVERSION=	6.0.0
 CATEGORIES+=	editors
 
 MAINTAINER=	office@FreeBSD.org
@@ -10,4 +10,4 @@ LICENSE=	LGPL3+ MPL20
 LICENSE_COMB=	dual
 
 LOVERSION=	${PORTVERSION}.${RCVER}
-RCVER=		2
+RCVER=		3
diff --git c/editors/libreoffice/distinfo i/editors/libreoffice/distinfo
index 3dd649a899e4..5716aa4e0fb7 100644
--- c/editors/libreoffice/distinfo
+++ i/editors/libreoffice/distinfo
@@ -1,14 +1,12 @@
-TIMESTAMP = 1508961364
-SHA256 (libreoffice/libreoffice-5.3.7.2.tar.xz) = c3d7ceecdf4d97dfd2ed748c4479152a1c9b8c879587a63a4f403209aed6ee7c
-SIZE (libreoffice/libreoffice-5.3.7.2.tar.xz) = 189508568
-SHA256 (libreoffice/libreoffice-help-5.3.7.2.tar.xz) = f65e68322c50c52382093153ef0753852dde97962e63c1426256a05ce007ae2c
-SIZE (libreoffice/libreoffice-help-5.3.7.2.tar.xz) = 2124656
+TIMESTAMP = 1517409263
+SHA256 (libreoffice/libreoffice-6.0.0.3.tar.xz) = dc2171845ec19d5a0cece2c0052172011b2ec435cac80cb47637f2af94e19e3d
+SIZE (libreoffice/libreoffice-6.0.0.3.tar.xz) = 203284136
+SHA256 (libreoffice/libreoffice-help-6.0.0.3.tar.xz) = 9f4750a5dc087c1b700dc200ffe614932e4f854c185084207b79f5a8e2968442
+SIZE (libreoffice/libreoffice-help-6.0.0.3.tar.xz) = 2972556
 SHA256 (libreoffice/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2) = b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb
 SIZE (libreoffice/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2) = 555291
-SHA256 (libreoffice/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz) = 41d463d16c9894cd3317098d027c038039c6d896b9cbb9bad9c4e29959e10e9f
-SIZE (libreoffice/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz) = 1794694
-SHA256 (libreoffice/cppunit-1.13.2.tar.gz) = 3f47d246e3346f2ba4d7c9e882db3ad9ebd3fcbd2e8b732f946e0e3eeb9f429f
-SIZE (libreoffice/cppunit-1.13.2.tar.gz) = 953596
+SHA256 (libreoffice/cppunit-1.14.0.tar.gz) = 3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780
+SIZE (libreoffice/cppunit-1.14.0.tar.gz) = 959716
 SHA256 (libreoffice/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
 SIZE (libreoffice/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = 3519470
 SHA256 (libreoffice/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip) = 5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b
diff --git c/editors/libreoffice/files/patch-bin_distro-install-desktop-integration i/editors/libreoffice/files/patch-bin_distro-install-desktop-integration
index 5b592beb80e5..51a89b071a3a 100644
--- c/editors/libreoffice/files/patch-bin_distro-install-desktop-integration
+++ i/editors/libreoffice/files/patch-bin_distro-install-desktop-integration
@@ -48,15 +48,15 @@
  
  # create bash completion
 -mkdir -p $DESTDIR/usr/share/bash-completion/completions
--"${SRCDIR?}"/bin/generate-bash-completion bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh
+-"${SRCDIR?}"/bin/generate-bash-completion.py bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh
 -test -f $DESTDIR/gid_Module_Root_Brand && echo "/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh" >>$DESTDIR/gid_Module_Root_Brand
 +mkdir -p $DESTDIR/${PREFIXDIR}/share/bash-completion/completions
-+"${SRCDIR?}"/bin/generate-bash-completion bin/bash-completion.in $DESTDIR${PREFIXDIR}/share/bash-completion/completions/$INSTALLDIRNAME.sh
++"${SRCDIR?}"/bin/generate-bash-completion.py bin/bash-completion.in $DESTDIR${PREFIXDIR}/share/bash-completion/completions/$INSTALLDIRNAME.sh
 +test -f $DESTDIR/gid_Module_Root_Brand && echo "${PREFIXDIR}/share/bash-completion/completions/$INSTALLDIRNAME.sh" >>$DESTDIR/gid_Module_Root_Brand
  if test "$WITH_COMPAT_OOWRAPPERS" = "TRUE" ; then
--    "${SRCDIR?}"/bin/generate-bash-completion --compat-oowrappers bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/ooffice.sh
+-    "${SRCDIR?}"/bin/generate-bash-completion.py --compat-oowrappers bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/ooffice.sh
 -    test -f $DESTDIR/gid_Module_Root_Brand && echo "/usr/share/bash-completion/completions/ooffice.sh" >>$DESTDIR/gid_Module_Root_Brand
-+    "${SRCDIR?}"/bin/generate-bash-completion --compat-oowrappers bin/bash-completion.in $DESTDIR${PREFIXDIR}/share/bash-completion/completions/ooffice.sh
++    "${SRCDIR?}"/bin/generate-bash-completion.py --compat-oowrappers bin/bash-completion.in $DESTDIR${PREFIXDIR}/share/bash-completion/completions/ooffice.sh
 +    test -f $DESTDIR/gid_Module_Root_Brand && echo "${PREFIXDIR}/share/bash-completion/completions/ooffice.sh" >>$DESTDIR/gid_Module_Root_Brand
  fi
  
diff --git c/editors/libreoffice/files/patch-configure i/editors/libreoffice/files/patch-configure
index 8cd94acb1274..c14ddec5c59e 100644
--- c/editors/libreoffice/files/patch-configure
+++ i/editors/libreoffice/files/patch-configure
@@ -9,56 +9,6 @@
  
  
  
-@@ -30076,12 +30076,12 @@ if test -n "$ORCUS_CFLAGS"; then
-     pkg_cv_ORCUS_CFLAGS="$ORCUS_CFLAGS"
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liborcus-0.12 >= 0.12.0\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "liborcus-0.12 >= 0.12.0") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liborcus-0.13 >= 0.13.0\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "liborcus-0.13 >= 0.13.0") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_ORCUS_CFLAGS=`$PKG_CONFIG --cflags "liborcus-0.12 >= 0.12.0" 2>/dev/null`
-+  pkg_cv_ORCUS_CFLAGS=`$PKG_CONFIG --cflags "liborcus-0.13 >= 0.13.0" 2>/dev/null`
- 		      test "x$?" != "x0" && pkg_failed=yes
- else
-   pkg_failed=yes
-@@ -30093,12 +30093,12 @@ if test -n "$ORCUS_LIBS"; then
-     pkg_cv_ORCUS_LIBS="$ORCUS_LIBS"
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liborcus-0.12 >= 0.12.0\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "liborcus-0.12 >= 0.12.0") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liborcus-0.13 >= 0.13.0\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "liborcus-0.13 >= 0.13.0") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_ORCUS_LIBS=`$PKG_CONFIG --libs "liborcus-0.12 >= 0.12.0" 2>/dev/null`
-+  pkg_cv_ORCUS_LIBS=`$PKG_CONFIG --libs "liborcus-0.13 >= 0.13.0" 2>/dev/null`
- 		      test "x$?" != "x0" && pkg_failed=yes
- else
-   pkg_failed=yes
-@@ -30119,14 +30119,14 @@ else
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        ORCUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "liborcus-0.12 >= 0.12.0" 2>&1`
-+	        ORCUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "liborcus-0.13 >= 0.13.0" 2>&1`
-         else
--	        ORCUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "liborcus-0.12 >= 0.12.0" 2>&1`
-+	        ORCUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "liborcus-0.13 >= 0.13.0" 2>&1`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$ORCUS_PKG_ERRORS" >&5
- 
--	as_fn_error $? "Package requirements (liborcus-0.12 >= 0.12.0) were not met:
-+	as_fn_error $? "Package requirements (liborcus-0.13 >= 0.13.0) were not met:
- 
- $ORCUS_PKG_ERRORS
- 
 @@ -32542,7 +32542,7 @@ fi
  
  
diff --git c/editors/libreoffice/files/patch-libreofficekit_source_gtk_lokdocview.cxx i/editors/libreoffice/files/patch-libreofficekit_source_gtk_lokdocview.cxx
new file mode 100644
index 000000000000..f21dd1bbb5e7
--- /dev/null
+++ i/editors/libreoffice/files/patch-libreofficekit_source_gtk_lokdocview.cxx
@@ -0,0 +1,18 @@
+--- libreofficekit/source/gtk/lokdocview.cxx.orig	2018-01-31 18:56:05.312032000 +0300
++++ libreofficekit/source/gtk/lokdocview.cxx	2018-01-31 18:56:30.075522000 +0300
+@@ -3218,6 +3218,7 @@
+                      G_TYPE_STRING);
+ 
+     /**
++     * LOKDocView::ruler:
+      * The key ruler related properties on change are reported by this.
+      *
+      * The payload format is:
+@@ -3244,6 +3245,7 @@
+                      G_TYPE_STRING);
+ 
+     /**
++     * LOKDocView::invalidate-header:
+      * The column/row header is no more valid because of a column/row insertion
+      * or a similar event. Clients must query a new column/row header set.
+      *
diff --git c/editors/libreoffice/files/patch-sal_osl_unx_system.cxx i/editors/libreoffice/files/patch-sal_osl_unx_system.cxx
deleted file mode 100644
index 081fa2dd9acb..000000000000
--- c/editors/libreoffice/files/patch-sal_osl_unx_system.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- sal/osl/unx/system.cxx.orig	2016-10-28 14:50:26 UTC
-+++ sal/osl/unx/system.cxx
-@@ -247,6 +247,9 @@ int macxp_resolveAlias(char *path, int b
- #endif /* NO_PTHREAD_RTL */
- 
- #if defined(FREEBSD)
-+
-+#include <cmath>
-+
- char *fcvt(double value, int ndigit, int *decpt, int *sign)
- {
-   static char ret[256];
diff --git c/editors/libreoffice/files/patch-sal_osl_unx_thread.cxx i/editors/libreoffice/files/patch-sal_osl_unx_thread.cxx
new file mode 100644
index 000000000000..56439e0d9c79
--- /dev/null
+++ i/editors/libreoffice/files/patch-sal_osl_unx_thread.cxx
@@ -0,0 +1,22 @@
+--- sal/osl/unx/thread.cxx.orig	2017-12-12 17:31:34.756103000 +0300
++++ sal/osl/unx/thread.cxx	2017-12-12 17:33:13.924729000 +0300
+@@ -45,6 +45,10 @@
+ #include <sys/syscall.h>
+ #endif
+ 
++#ifdef __FreeBSD_kernel__
++#include <pthread_np.h>
++#endif
++
+ /****************************************************************************
+  * @@@ TODO @@@
+  *
+@@ -545,7 +549,7 @@
+     if ( 0 != err )
+         SAL_WARN("sal.osl", "pthread_setname_np failed with errno " << err);
+ #elif defined __FreeBSD_kernel__
+-    pthread_setname_np( pthread_self(), name );
++    pthread_set_name_np( pthread_self(), name );
+ #elif defined MACOSX || defined IOS
+     pthread_setname_np( name );
+ #else
diff --git c/editors/libreoffice/files/patch-sc_source_filter_inc_orcusinterface.hxx i/editors/libreoffice/files/patch-sc_source_filter_inc_orcusinterface.hxx
deleted file mode 100644
index af9219970592..000000000000
--- c/editors/libreoffice/files/patch-sc_source_filter_inc_orcusinterface.hxx
+++ /dev/null
@@ -1,40 +0,0 @@
---- sc/source/filter/inc/orcusinterface.hxx.orig	2017-10-25 14:25:39 UTC
-+++ sc/source/filter/inc/orcusinterface.hxx
-@@ -183,7 +183,8 @@ class ScOrcusSheetProperties : public orcus::spreadshe
- 
-     virtual void set_row_hidden(orcus::spreadsheet::row_t row, bool hidden) override;
- 
--    virtual void set_merge_cell_range(const char* p_range, size_t n_range) override;
-+
-+    virtual void set_merge_cell_range(const orcus::spreadsheet::range_t& range) override;
- };
- 
- class ScOrcusSheet : public orcus::spreadsheet::iface::import_sheet
-@@ -243,6 +244,8 @@ class ScOrcusSheet : public orcus::spreadsheet::iface:
-         orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar,
-         const char* p, size_t n, const char* p_range, size_t n_range) override;
- 
-+    virtual orcus::spreadsheet::range_size_t get_sheet_size() const override;
-+
-     SCTAB getIndex() const { return mnTab; }
- };
- 
-@@ -418,7 +421,7 @@ class ScOrcusStyles : public orcus::spreadsheet::iface
-     // border
- 
-     virtual void set_border_count(size_t n) override;
--    virtual void set_border_style(orcus::spreadsheet::border_direction_t dir, const char* s, size_t n) override;
-+
-     virtual void set_border_style(orcus::spreadsheet::border_direction_t dir, orcus::spreadsheet::border_style_t style) override;
-     virtual void set_border_color(orcus::spreadsheet::border_direction_t dir,
-             orcus::spreadsheet::color_elem_t alpha,
-@@ -508,7 +511,8 @@ class ScOrcusFactory : public orcus::spreadsheet::ifac
- public:
-     ScOrcusFactory(ScDocument& rDoc);
- 
--    virtual orcus::spreadsheet::iface::import_sheet* append_sheet(const char *sheet_name, size_t sheet_name_length) override;
-+    virtual orcus::spreadsheet::iface::import_sheet* append_sheet(
-+        orcus::spreadsheet::sheet_t sheet_index, const char *sheet_name, size_t sheet_name_length) override;
-     virtual orcus::spreadsheet::iface::import_sheet* get_sheet(const char *sheet_name, size_t sheet_name_length) override;
-     virtual orcus::spreadsheet::iface::import_sheet* get_sheet(orcus::spreadsheet::sheet_t sheet_index) override;
-     virtual orcus::spreadsheet::iface::import_global_settings* get_global_settings() override;
diff --git c/editors/libreoffice/files/patch-sc_source_filter_orcus_interface.cxx i/editors/libreoffice/files/patch-sc_source_filter_orcus_interface.cxx
deleted file mode 100644
index 5c96e9920629..000000000000
--- c/editors/libreoffice/files/patch-sc_source_filter_orcus_interface.cxx
+++ /dev/null
@@ -1,59 +0,0 @@
---- sc/source/filter/orcus/interface.cxx.orig	2017-10-25 14:25:39 UTC
-+++ sc/source/filter/orcus/interface.cxx
-@@ -84,7 +84,8 @@ ScOrcusFactory::ScOrcusFactory(ScDocument& rDoc) :
-     maStyles(rDoc),
-     mnProgress(0) {}
- 
--orcus::spreadsheet::iface::import_sheet* ScOrcusFactory::append_sheet(const char* sheet_name, size_t sheet_name_length)
-+orcus::spreadsheet::iface::import_sheet* ScOrcusFactory::append_sheet(
-+    orcus::spreadsheet::sheet_t /*sheet_index*/, const char* sheet_name, size_t sheet_name_length)
- {
-     OUString aTabName(sheet_name, sheet_name_length, RTL_TEXTENCODING_UTF8);
-     if (!maDoc.appendSheet(aTabName))
-@@ -296,7 +297,7 @@ void ScOrcusSheetProperties::set_row_hidden(os::row_t 
-         mrDoc.getDoc().SetRowHidden(row, row, mnTab, hidden);
- }
- 
--void ScOrcusSheetProperties::set_merge_cell_range(const char* /*p_range*/, size_t /*n_range*/)
-+void ScOrcusSheetProperties::set_merge_cell_range(const orcus::spreadsheet::range_t& /*range*/)
- {
- }
- 
-@@ -576,6 +577,9 @@ formula::FormulaGrammar::Grammar getCalcGrammarFromOrc
-         case orcus::spreadsheet::formula_grammar_t::gnumeric:
-             eGrammar = formula::FormulaGrammar::GRAM_ENGLISH_XL_A1;
-             break;
-+        case orcus::spreadsheet::formula_grammar_t::xls_xml:
-+            eGrammar = formula::FormulaGrammar::GRAM_ENGLISH_XL_R1C1;
-+            break;
-         case orcus::spreadsheet::formula_grammar_t::unknown:
-             break;
-     }
-@@ -693,6 +697,15 @@ void ScOrcusSheet::set_array_formula(
- {
- }
- 
-+orcus::spreadsheet::range_size_t ScOrcusSheet::get_sheet_size() const
-+{
-+    orcus::spreadsheet::range_size_t ret;
-+    ret.rows = MAXROWCOUNT;
-+    ret.columns = MAXCOLCOUNT;
-+
-+    return ret;
-+}
-+
- ScOrcusSharedStrings::ScOrcusSharedStrings(ScOrcusFactory& rFactory) :
-     mrFactory(rFactory) {}
- 
-@@ -1281,11 +1294,6 @@ size_t ScOrcusStyles::commit_fill()
- void ScOrcusStyles::set_border_count(size_t /*n*/)
- {
-     // needed at all?
--}
--
--void ScOrcusStyles::set_border_style(orcus::spreadsheet::border_direction_t /*dir*/, const char* /*s*/, size_t /*n*/)
--{
--    // implement later
- }
- 
- void ScOrcusStyles::set_border_style(
diff --git c/editors/libreoffice/files/patch-sc_source_ui_docshell_datastream.cxx i/editors/libreoffice/files/patch-sc_source_ui_docshell_datastream.cxx
deleted file mode 100644
index 97288ff8514d..000000000000
--- c/editors/libreoffice/files/patch-sc_source_ui_docshell_datastream.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- sc/source/ui/docshell/datastream.cxx.orig	2017-10-25 14:25:39 UTC
-+++ sc/source/ui/docshell/datastream.cxx
-@@ -84,7 +84,7 @@ class CSVHandler (public)
-     static void begin_row() {}
-     static void end_row() {}
- 
--    void cell(const char* p, size_t n)
-+    void cell(const char* p, size_t n, bool /*transient*/)
-     {
-         if (mnCols >= mnColCount)
-             return;
diff --git c/editors/libreoffice/files/patch-sfx2_source_control_emojiview.cxx i/editors/libreoffice/files/patch-sfx2_source_control_emojiview.cxx
deleted file mode 100644
index 7598b2b4208a..000000000000
--- c/editors/libreoffice/files/patch-sfx2_source_control_emojiview.cxx
+++ /dev/null
@@ -1,26 +0,0 @@
---- sfx2/source/control/emojiview.cxx.orig	2017-10-25 14:25:39 UTC
-+++ sfx2/source/control/emojiview.cxx
-@@ -104,12 +104,12 @@ void EmojiView::Populate()
-     }
- 
-     // TODO::populate view using the orcus json parser
--    using node = orcus::json_document_tree::node;
-+    using node = orcus::json::node;
- 
-     // default json config
-     orcus::json_config config;
- 
--    orcus::json_document_tree aEmojiInfo;
-+    orcus::json::document_tree aEmojiInfo;
- 
-     // Load JSON string into a document tree.
-     aEmojiInfo.load(msJSONData, config);
-@@ -122,7 +122,7 @@ void EmojiView::Populate()
-         orcus::pstring key = *it;
-         node value = root.child(key);
- 
--        if(value.type() == orcus::json_node_t::object)
-+        if(value.type() == orcus::json::node_t::object)
-         {
-             // iterate each element to get the keys
-             std::vector<orcus::pstring> aEmojiParams = value.keys();
diff --git c/editors/libreoffice/files/patch-shell_source_unix_exec_shellexec.cxx i/editors/libreoffice/files/patch-shell_source_unix_exec_shellexec.cxx
index a52189df87db..3c8a62b6a069 100644
--- c/editors/libreoffice/files/patch-shell_source_unix_exec_shellexec.cxx
+++ i/editors/libreoffice/files/patch-shell_source_unix_exec_shellexec.cxx
@@ -1,11 +1,11 @@
---- shell/source/unix/exec/shellexec.cxx.orig	2017-01-12 00:54:33 UTC
-+++ shell/source/unix/exec/shellexec.cxx
-@@ -157,7 +157,7 @@ void SAL_CALL ShellExec::execute( const 
-         if (std::getenv("LIBO_FLATPAK") != nullptr) {
-             aBuffer.append("/app/bin/xdg-open");
-         } else {
--            aBuffer.append("/usr/bin/xdg-open");
-+            aBuffer.append("%%LOCALBASE%%/bin/xdg-open");
-         }
+--- shell/source/unix/exec/shellexec.cxx.orig	2017-12-08 02:26:19.000000000 +0300
++++ shell/source/unix/exec/shellexec.cxx	2017-12-12 15:51:21.551684000 +0300
+@@ -145,7 +145,7 @@
+         aBuffer.append("open --");
+ #else
+         // Just use xdg-open on non-Mac
+-        aBuffer.append("/usr/bin/xdg-open");
++        aBuffer.append("%%LOCALBASE%%/bin/xdg-open");
  #endif
          aBuffer.append(" ");
+         escapeForShell(aBuffer, OUStringToOString(aURL, osl_getThreadTextEncoding()));
diff --git c/editors/libreoffice/files/patch-vcl_CppunitTest__vcl__wmf__test.mk i/editors/libreoffice/files/patch-vcl_CppunitTest__vcl__wmf__test.mk
deleted file mode 100644
index 7483c246197d..000000000000
--- c/editors/libreoffice/files/patch-vcl_CppunitTest__vcl__wmf__test.mk
+++ /dev/null
@@ -1,15 +0,0 @@
---- vcl/CppunitTest_vcl_wmf_test.mk.orig	2017-05-03 16:46:29 UTC
-+++ vcl/CppunitTest_vcl_wmf_test.mk
-@@ -131,10 +131,9 @@ $(eval $(call gb_CppunitTest_use_externals,vcl_wmf_tes
- ))
- endif
- else
--ifeq ($(OS),LINUX)
-+ifeq ($(OS), $(filter LINUX %BSD, $(OS)))
- $(eval $(call gb_CppunitTest_add_libs,vcl_wmf_test,\
--    -lm \
--    -ldl \
-+    -lm $(DLOPEN_LIBS) \
-     -lpthread \
-     -lGL \
-     -lX11 \
diff --git c/editors/libreoffice/files/patch-vcl_Executable__visualbackendtest.mk i/editors/libreoffice/files/patch-vcl_Executable__visualbackendtest.mk
index ffacbf954b2d..201a39f53780 100644
--- c/editors/libreoffice/files/patch-vcl_Executable__visualbackendtest.mk
+++ i/editors/libreoffice/files/patch-vcl_Executable__visualbackendtest.mk
@@ -11,9 +11,7 @@
 -	-ldl \
 +	-lm $(DLOPEN_LIBS) \
  	-lpthread \
--    -lGL \
 -    -lX11 \
-+	-lGL \
 +	-lX11 \
  ))
  
diff --git c/editors/libreoffice/files/patch-vcl_Library__vcl.mk i/editors/libreoffice/files/patch-vcl_Library__vcl.mk
deleted file mode 100644
index b41d223e9afb..000000000000
--- c/editors/libreoffice/files/patch-vcl_Library__vcl.mk
+++ /dev/null
@@ -1,20 +0,0 @@
---- vcl/Library_vcl.mk.orig	2017-05-03 16:46:29 UTC
-+++ vcl/Library_vcl.mk
-@@ -643,13 +643,12 @@ else
-     vcl/source/opengl/OpenGLHelper \
-     vcl/source/window/openglwin \
-  ))
--ifeq ($(OS),LINUX)
-+ifeq ($(OS), $(filter LINUX %BSD, $(OS)))
- $(eval $(call gb_Library_add_libs,vcl,\
--	-lm \
--	-ldl \
-+	-lm $(DLOPEN_LIBS) \
- 	-lpthread \
--    -lGL \
--    -lX11 \
-+	-lGL \
-+	-lX11 \
- ))
- endif
- endif
diff --git c/editors/libreoffice/files/patch-vcl_unx_gtk_fpicker_SalGtkFilePicker.cxx i/editors/libreoffice/files/patch-vcl_unx_gtk_fpicker_SalGtkFilePicker.cxx
deleted file mode 100644
index dc2ea8a099df..000000000000
--- c/editors/libreoffice/files/patch-vcl_unx_gtk_fpicker_SalGtkFilePicker.cxx
+++ /dev/null
@@ -1,18 +0,0 @@
---- vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx.orig	2017-01-12 00:54:33 UTC
-+++ vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
-@@ -436,10 +436,13 @@ dialog_remove_buttons( GtkDialog *pDialo
- {
-     g_return_if_fail( GTK_IS_DIALOG( pDialog ) );
- 
--#if GTK_CHECK_VERSION(3,0,0)
- #if GTK_CHECK_VERSION(3,12,0)
--    dialog_remove_buttons(gtk_dialog_get_header_bar(pDialog));
-+    GtkWidget *pHeaderBar = gtk_dialog_get_header_bar( pDialog );
-+    if( pHeaderBar != nullptr )
-+        dialog_remove_buttons( pHeaderBar );
-+    else
- #endif
-+#if GTK_CHECK_VERSION(2,14,0)
-     dialog_remove_buttons(gtk_dialog_get_action_area(pDialog));
- #else
-     dialog_remove_buttons(pDialog->action_area);