diff --git a/app-office/libreoffice/additional-files/libreoffice.rdef.in b/app-office/libreoffice/additional-files/libreoffice.rdef.in
new file mode 100644
index 000000000..13ff80c3d
--- /dev/null
+++ b/app-office/libreoffice/additional-files/libreoffice.rdef.in
@@ -0,0 +1,42 @@
+
+resource app_flags B_MULTIPLE_LAUNCH;
+
+resource app_version {
+	major  = @MAJOR@,
+	middle = @MIDDLE@,
+	minor  = @MINOR@,
+
+	variety = B_APPV_FINAL,
+	internal = 0,
+
+	short_info = "LibreOffice",
+	long_info = "@LONG_INFO@"
+};
+
+resource app_signature "@APP_SIGNATURE@";
+
+resource file_types message {
+	"types" = "application/msword",
+	"types" = "text/plain",
+	"types" = "text/rtf",
+	"types" = "application/x-mswrite",
+	"types" = "application/vnd.oasis.opendocument.text-master",
+	"types" = "application/vnd.oasis.opendocument.text",
+	"types" = "application/vnd.oasis.opendocument.text-template",
+	"types" = "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+	"types" = "application/vnd.openxmlformats-officedocument.wordprocessingml.template",
+	"types" = "application/vnd.ms-works",
+	"types" = "application/vnd.wordperfect"
+};
+
+resource vector_icon {
+	$"6E63696601050003020AC115B38FC115B38FC0C6B340BFB920C02920BFB920B6"
+	$"2E20B62E20B5BE20B562B3CBB562B35BB562B3CBB562CBA7B562CBA7B562CC17"
+	$"B62ECC73B5BECC73B62ECC73C944CC73C944CC73C9B4CC73CA10CBA7CA10CC17"
+	$"CA10CBA7CA10BD56CA10BD56CA10BCE6C980BBFBC9CFBC4AC980BBFB0608D27F"
+	$"C879CADCB6FAB497BFB4B497BFB4B497BFC6B49ABFF9B4B3BFE9B4A8BFF9B4B3"
+	$"C85CBD17C85CBD17C867BD26C8793AC876BD49C8793ACADC0206C94420C9B420"
+	$"C94420C47F20C47F20C40F20C443B38FC3F4B340C443B38FC980B8CCC980B8CC"
+	$"C9CFB91CCA10B891CA10B901CA10B891CA10B3CBCA10B3CBCA10B35B010A0003"
+	$"00010200"
+};
diff --git a/app-office/libreoffice/libreoffice-6.0.4.2~git.recipe b/app-office/libreoffice/libreoffice-6.0.4.2~git.recipe
deleted file mode 100644
index 7e7f624c8..000000000
--- a/app-office/libreoffice/libreoffice-6.0.4.2~git.recipe
+++ /dev/null
@@ -1,128 +0,0 @@
-SUMMARY="A full office productivity suite"
-DESCRIPTION="LibreOffice is a powerful office suite – its clean interface and \
-feature-rich tools help you unleash your creativity and enhance your \
-productivity.
-LibreOffice includes several applications that make it the most powerful Free \
-and Open Source office suite on the market."
-HOMEPAGE="https://www.libreoffice.org/"
-COPYRIGHT="2000, 2010 Oracle and/or its affiliates.
-	2000, 2010 LibreOffice contributors and/or their affiliates."
-LICENSE="MPL v2.0"
-REVISION="1"
-COMMIT="ff4d75891fb947989d16df58a6b2805f20102fc6"
-SOURCE_URI="https://github.com/LibreOffice/core/archive/$COMMIT.tar.gz"
-CHECKSUM_SHA256="b6ac86d714490b27617d4a08dc622239bf2795a21a236f16096eaa945f760cbb"
-SOURCE_DIR="core-$COMMIT"
-PATCHES="libreoffice-$portVersion.patchset"
-
-ARCHITECTURES="!x86_gcc2 ?x86_64"
-SECONDARY_ARCHITECTURES="?x86"
-
-PROVIDES="
-	libreoffice$secondaryArchSuffix = $portVersion
-	cmd:libreoffice$secondaryArchSuffix = $portVersion
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	libreoffice${secondaryArchSuffix}_devel = $portVersion
-	"
-REQUIRES_devel="
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	glm${secondaryArchSuffix}_devel
-	devel:libabw_0.1$secondaryArchSuffix
-	devel:libcdr_0.1$secondaryArchSuffix
-	devel:libclucene_contribs_lib$secondaryArchSuffix
-	devel:libclucene_core$secondaryArchSuffix
-	devel:libcmis_0.5$secondaryArchSuffix
-	devel:libcppunit$secondaryArchSuffix
-	devel:libcurl$secondaryArchSuffix
-	devel:libe_book_0.1$secondaryArchSuffix
-	devel:libepoxy$secondaryArchSuffix
-	devel:libepubgen_0.0$secondaryArchSuffix
-	devel:libetonyek_0.1$secondaryArchSuffix
-	devel:libexpat$secondaryArchSuffix
-	devel:libfreehand_0.1$secondaryArchSuffix
-	devel:libglew$secondaryArchSuffix
-	devel:libgraphite2$secondaryArchSuffix
-	devel:libharfbuzz_icu$secondaryArchSuffix
-	devel:libhunspell_1.6$secondaryArchSuffix
-	devel:libhyphen$secondaryArchSuffix
-	devel:libicuuc$secondaryArchSuffix
-	devel:libjpeg$secondaryArchSuffix
-	devel:liblangtag$secondaryArchSuffix
-	devel:liblcms2$secondaryArchSuffix
-	devel:libldap$secondaryArchSuffix
-	devel:liblpsolve55$secondaryArchSuffix
-	devel:libmspub_0.1$secondaryArchSuffix
-	devel:libmwaw_0.3$secondaryArchSuffix
-	devel:libneon$secondaryArchSuffix
-	devel:libnss3$secondaryArchSuffix
-	devel:libodfgen_0.1$secondaryArchSuffix
-	devel:liborcus_0.13$secondaryArchSuffix
-	devel:libpagemaker_0.0$secondaryArchSuffix
-	devel:libpoppler$secondaryArchSuffix
-	devel:libqxp_0.0$secondaryArchSuffix
-	devel:libraptor2$secondaryArchSuffix
-	devel:librdf$secondaryArchSuffix
-	devel:librevenge_0.0$secondaryArchSuffix
-	devel:libsane$secondaryArchSuffix
-	devel:libssl$secondaryArchSuffix
-	devel:libstaroffice_0.0$secondaryArchSuffix
-	devel:libvisio_0.1$secondaryArchSuffix
-	devel:libwpd_0.10$secondaryArchSuffix
-	devel:libwpg_0.3$secondaryArchSuffix
-	devel:libwps_0.4$secondaryArchSuffix
-	devel:libxslt$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
-	devel:libzmf_0.0$secondaryArchSuffix
-	devel:mdds$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:autoconf
-	cmd:bison
-	cmd:find
-	cmd:flex
-	cmd:gcc$secondaryArchSuffix
-	cmd:genbrk
-	cmd:genccode
-	cmd:gencmn
-	cmd:git
-	cmd:gperf
-	cmd:grep
-	cmd:ld$secondaryArchSuffix
-	cmd:make
-	cmd:patch
-	cmd:perl
-	cmd:pkg_config$secondaryArchSuffix
-	cmd:python2.7
-	cmd:python3.6
-	cmd:which
-	cmd:xz
-	cmd:zip
-	"
-BUILD()
-{
-	# cppunittester crashes a lot on Haiku, see #13159. To workaround this create
-	# ~/config/settings/system/debug_server/settings with the following content:
-
-	# executable_actions {
-	#	cppunittester kill
-	# }
-
-	./autogen.sh --with-distro=LibreOfficeHaiku --enable-qt5
-	# --disable-fetch-external
-
-	make $jobArgs build-nocheck -k
-}
-
-INSTALL()
-{
-	make distro-pack-install
-}
diff --git a/app-office/libreoffice/libreoffice-6.1.0.0~git.recipe b/app-office/libreoffice/libreoffice-6.1.0.0~git.recipe
new file mode 100644
index 000000000..3deff372b
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.1.0.0~git.recipe
@@ -0,0 +1,226 @@
+SUMMARY="A full office productivity suite"
+DESCRIPTION="LibreOffice is a powerful office suite – its clean interface and \
+feature-rich tools help you unleash your creativity and enhance your \
+productivity.
+LibreOffice includes several applications that make it the most powerful Free \
+and Open Source office suite on the market."
+HOMEPAGE="https://www.libreoffice.org/"
+COPYRIGHT="2000, 2010 Oracle and/or its affiliates.
+	2000, 2010 LibreOffice contributors and/or their affiliates."
+LICENSE="MPL v2.0"
+REVISION="1"
+COMMIT="08c2927e0587428d2c242ffcdf142d39f23df092"
+SOURCE_URI="https://github.com/LibreOffice/core/archive/$COMMIT.tar.gz"
+CHECKSUM_SHA256="7f947f57743d817205b3f4f7494e21b39bdd9e2d52543c4fbc9538a99870488a"
+SOURCE_DIR="core-$COMMIT"
+PATCHES="libreoffice-$portVersion.patchset"
+ADDITIONAL_FILES="libreoffice.rdef.in"
+
+ARCHITECTURES="!x86_gcc2 ?x86_64"
+SECONDARY_ARCHITECTURES="?x86"
+
+PROVIDES="
+	libreoffice$secondaryArchSuffix = $portVersion
+	app:LibreOffice$secondaryArchSuffix = $portVersion
+	cmd:libreoffice$secondaryArchSuffix = $portVersion
+	cmd:lobase$secondaryArchSuffix = $portVersion
+	cmd:localc$secondaryArchSuffix = $portVersion
+	cmd:lodraw$secondaryArchSuffix = $portVersion
+	cmd:loffice$secondaryArchSuffix = $portVersion
+	cmd:lofromtemplate$secondaryArchSuffix = $portVersion
+	cmd:loimpress$secondaryArchSuffix = $portVersion
+	cmd:lomath$secondaryArchSuffix = $portVersion
+	cmd:loweb$secondaryArchSuffix = $portVersion
+	cmd:lowriter$secondaryArchSuffix = $portVersion
+	cmd:soffice$secondaryArchSuffix = $portVersion
+	cmd:unopkg$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libabw_0.1$secondaryArchSuffix
+	lib:libboost_date_time$secondaryArchSuffix
+	lib:libboost_filesystem$secondaryArchSuffix
+	lib:libboost_iostreams$secondaryArchSuffix
+	lib:libboost_locale$secondaryArchSuffix
+	lib:libcairo$secondaryArchSuffix
+	lib:libcdr_0.1$secondaryArchSuffix
+	lib:libclucene_core$secondaryArchSuffix
+	lib:libcmis_0.5$secondaryArchSuffix
+	lib:libcrypto$secondaryArchSuffix
+	lib:libcurl$secondaryArchSuffix
+	lib:libe_book_0.1$secondaryArchSuffix
+	lib:libepoxy$secondaryArchSuffix
+	lib:libetonyek_0.1$secondaryArchSuffix
+	lib:libexpat$secondaryArchSuffix
+	lib:libexslt$secondaryArchSuffix
+	lib:libfontconfig$secondaryArchSuffix
+	lib:libfreehand_0.1$secondaryArchSuffix
+	lib:libfreetype$secondaryArchSuffix
+	lib:libglib_2.0$secondaryArchSuffix
+	lib:libgraphite2$secondaryArchSuffix
+	lib:libharfbuzz_icu$secondaryArchSuffix
+	lib:libharfbuzz$secondaryArchSuffix
+	lib:libhunspell_1.6$secondaryArchSuffix
+	lib:libhyphen$secondaryArchSuffix
+	lib:libicui18n$secondaryArchSuffix
+	lib:libicuuc$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+	lib:liblangtag$secondaryArchSuffix
+	lib:liblber_2.4$secondaryArchSuffix
+	lib:liblcms2$secondaryArchSuffix
+	lib:libldap_2.4$secondaryArchSuffix
+	lib:liblpsolve55$secondaryArchSuffix
+	lib:libmspub_0.1$secondaryArchSuffix
+	lib:libmwaw_0.3$secondaryArchSuffix
+	lib:libneon$secondaryArchSuffix
+	lib:libnspr4$secondaryArchSuffix
+	lib:libnss3$secondaryArchSuffix
+	lib:libnssutil3$secondaryArchSuffix
+	lib:libodfgen_0.1$secondaryArchSuffix
+	lib:liborcus_0.13$secondaryArchSuffix
+	lib:libpagemaker_0.0$secondaryArchSuffix
+	lib:libplc4$secondaryArchSuffix
+	lib:libplds4$secondaryArchSuffix
+	lib:libpng16$secondaryArchSuffix
+	lib:libpoppler$secondaryArchSuffix
+	lib:libQt5Core$secondaryArchSuffix
+	lib:libQt5Gui$secondaryArchSuffix
+	lib:libQt5Network$secondaryArchSuffix
+	lib:libQt5Widgets$secondaryArchSuffix
+	lib:libqxp_0.0$secondaryArchSuffix
+	lib:libraptor2$secondaryArchSuffix
+	lib:librdf$secondaryArchSuffix
+	lib:librevenge_0.0$secondaryArchSuffix
+	lib:librevenge_stream_0.0$secondaryArchSuffix
+	lib:libsmime3$secondaryArchSuffix
+	lib:libssl$secondaryArchSuffix
+	lib:libssl3$secondaryArchSuffix
+	lib:libssp$secondaryArchSuffix
+	lib:libstaroffice_0.0$secondaryArchSuffix
+	lib:libvisio_0.1$secondaryArchSuffix
+	lib:libwpd_0.10$secondaryArchSuffix
+	lib:libwpg_0.3$secondaryArchSuffix
+	lib:libwps_0.4$secondaryArchSuffix
+	lib:libxml2$secondaryArchSuffix
+	lib:libxslt$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	lib:libzmf_0.0$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	glm${secondaryArchSuffix}_devel
+	devel:libabw_0.1$secondaryArchSuffix
+	devel:libcdr_0.1$secondaryArchSuffix
+	devel:libclucene_contribs_lib$secondaryArchSuffix
+	devel:libclucene_core$secondaryArchSuffix
+	devel:libcmis_0.5$secondaryArchSuffix
+	devel:libcppunit$secondaryArchSuffix
+	devel:libcurl$secondaryArchSuffix
+	devel:libe_book_0.1$secondaryArchSuffix
+	devel:libepoxy$secondaryArchSuffix
+	devel:libepubgen_0.0$secondaryArchSuffix
+	devel:libetonyek_0.1$secondaryArchSuffix
+	devel:libexpat$secondaryArchSuffix
+	devel:libfreehand_0.1$secondaryArchSuffix
+	devel:libglew$secondaryArchSuffix
+	devel:libgraphite2$secondaryArchSuffix
+	devel:libharfbuzz_icu$secondaryArchSuffix
+	devel:libhunspell_1.6$secondaryArchSuffix
+	devel:libhyphen$secondaryArchSuffix
+	devel:libicuuc$secondaryArchSuffix
+	devel:libjpeg$secondaryArchSuffix
+	devel:liblangtag$secondaryArchSuffix
+	devel:liblcms2$secondaryArchSuffix
+	devel:libldap$secondaryArchSuffix
+	devel:liblpsolve55$secondaryArchSuffix
+	devel:libmspub_0.1$secondaryArchSuffix
+	devel:libmwaw_0.3$secondaryArchSuffix
+	devel:libneon$secondaryArchSuffix
+	devel:libnss3$secondaryArchSuffix
+	devel:libodfgen_0.1$secondaryArchSuffix
+	devel:liborcus_0.13$secondaryArchSuffix
+	devel:libpagemaker_0.0$secondaryArchSuffix
+	devel:libpoppler$secondaryArchSuffix
+	devel:libqxp_0.0$secondaryArchSuffix
+	devel:libraptor2$secondaryArchSuffix
+	devel:librdf$secondaryArchSuffix
+	devel:librevenge_0.0$secondaryArchSuffix
+	devel:libsane$secondaryArchSuffix
+	devel:libssl$secondaryArchSuffix
+	devel:libstaroffice_0.0$secondaryArchSuffix
+	devel:libvisio_0.1$secondaryArchSuffix
+	devel:libwpd_0.10$secondaryArchSuffix
+	devel:libwpg_0.3$secondaryArchSuffix
+	devel:libwps_0.4$secondaryArchSuffix
+	devel:libxslt$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	devel:libzmf_0.0$secondaryArchSuffix
+	devel:mdds$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:bison
+	cmd:find
+	cmd:flex
+	cmd:gcc$secondaryArchSuffix
+	cmd:genbrk
+	cmd:genccode
+	cmd:gencmn
+	cmd:git
+	cmd:gperf
+	cmd:grep
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:patch
+	cmd:perl
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:python2.7
+	cmd:python3.6
+	cmd:which
+	cmd:xz
+	cmd:zip
+	"
+BUILD()
+{
+	# rename $sourceDir to something shorter, otherwise build fails with
+	# execv: Argument too big /sources/core/sw/Library_sw.mk:20
+	cd .. ; mv $sourceDir core
+	ln -s core core-$COMMIT; cd core
+
+	runConfigure ./autogen.sh --with-distro=LibreOfficeHaiku --enable-qt5
+		# --disable-fetch-external
+
+	make $jobArgs build-nocheck -k  # DESTDIR=$appsDir/LibreOffice
+
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir/LibreOffice
+	cp -r ../core/instdir/* $appsDir/LibreOffice
+	mv soffice.bin LibreOffice
+
+	# workaround for missing lib
+	cd $appsDir/LibreOffice/program
+	rm -f libvclplug_kde4lo.so
+	ln -s libvclplug_qt5lo.so libvclplug_kde4lo.so
+
+	local APP_SIGNATURE="application/x-vnd.LibreOffice"
+	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
+	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
+	local MINOR="`echo "$portVersion" | cut -d. -f3`"
+	local LONG_INFO="$SUMMARY"
+	sed \
+		-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
+		-e "s|@MAJOR@|$MAJOR|" \
+		-e "s|@MIDDLE@|$MIDDLE|" \
+		-e "s|@MINOR@|$MINOR|" \
+		-e "s|@LONG_INFO@|$LONG_INFO|" \
+		$portDir/additional-files/libreoffice.rdef.in > libreoffice.rdef
+
+	addResourcesToBinaries libreoffice.rdef $appsDir/LibreOffice/program/LibreOffice
+	addAppDeskbarSymlink $appsDir/LibreOffice/program/LibreOffice
+}
diff --git a/app-office/libreoffice/patches/libreoffice-6.0.4.2~git.patchset b/app-office/libreoffice/patches/libreoffice-6.1.0.0~git.patchset
similarity index 100%
rename from app-office/libreoffice/patches/libreoffice-6.0.4.2~git.patchset
rename to app-office/libreoffice/patches/libreoffice-6.1.0.0~git.patchset