diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 99fdef3af9d..a704c55940d 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,14 +1,13 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
-version=6.0.0.3
-revision=2
+version=6.0.1.1
+revision=1
 build_style=gnu-configure
 configure_args="--disable-werror"
 nocross=yes
 
 #
 # XXX: mit-krb5-devel nasm firebird3 hamcrest iwyu ogl-math
-# TODO: package libepubgen and libqxp; something is wrong with glm
 # Missing, required libraries are downloaded and built internally
 #
 hostmakedepends="automake libtool pkg-config bison flex gperf icu
@@ -22,7 +21,8 @@ makedepends="apr-devel gst-plugins-base1-devel gtk+-devel gtk+3-devel
  libexttextcat-devel libgltf-devel libldap-devel libmspub-devel libmwaw-devel
  glew-devel glyphy-devel gst-plugins-base1-devel libodfgen-devel
  libpagemaker-devel libvisio-devel libetonyek-devel libwpg-devel telepathy-glib-devel
- libwps-devel glm mdds0 mythes-devel opencollada-devel sane-devel vigra-devel vlc-devel"
+ libepubgen-devel libqxp-devel libwps-devel glm mdds0 mythes-devel
+ sane-devel vigra-devel vlc-devel"
 depends="hyphen openldap sane"
 short_desc="Productivity suite, formerly OpenOffice.org"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
@@ -54,10 +54,10 @@ distfiles="
  ${_ooopurl}/${_ooop_templates_md5hash}-OOOP-templates-pack-${_ooop_templates_version}.zip
 "
 checksum="
- dc2171845ec19d5a0cece2c0052172011b2ec435cac80cb47637f2af94e19e3d
- 98d48c683b54de88912643b18739c030bb81d7529c2611d622321c03bf0665d2
- 9f4750a5dc087c1b700dc200ffe614932e4f854c185084207b79f5a8e2968442
- 8afeb5cbb608e451a9b1acaef87601323faf403b490bd188edb5ddeedd60587e
+ 8f802a9c6ed645218a07b34530113f357b694f2653d734fe8a9003068b5670a9
+ 0c05e39b8d242ada1d0ade0745fbb03083cb094926017cf36e8067056edba96a
+ 4466ffc014f5dd3bc7b2676c18e25687c95b00f0379b61c8db988091a4a5d647
+ 52a2ce93d87f0c248d08685f9eb37fd11c8e0196f8795fe516dd156ecdd21047
  cf21b8a0a58c0f0af562869846ce2af4c68b13a7178b9b74ee7be7480a87c84c
  c95f6c398e81ee7def378e51e4c7b5bdeba526f28ff281e79ca3795e6d467159
  1834aa0632499134f98ce85057d6d67604b9ed3b7efa7f13e76046f5886a3a2d
@@ -160,7 +160,6 @@ do_configure() {
 	# New strategy: enable all libs and headers, then disable what's missing
 	configure_args+=" --with-system-libs"
 	configure_args+=" --with-system-headers"
-	configure_args+=" --with-system-opencollada"
 	case "$XBPS_TARGET_MACHINE" in
 	i686*|*-musl)
 		# Can't use system clucence
@@ -193,17 +192,13 @@ do_configure() {
 	configure_args+=" --without-system-jfreereport"
 	configure_args+=" --without-system-apache-commons"
 	configure_args+=" --without-system-beanshell"
-	configure_args+=" --without-system-libepubgen"
-	configure_args+=" --without-system-libqxp"
-	configure_args+=" --without-system-glm"
+	# configure_args+=" --without-system-glm"
 	configure_args+=" --with-myspell-dicts"
 	configure_args+=" --with-system-icu-for-build=yes"
 	configure_args+=" --with-external-hyph-dir=${XBPS_CROSS_BASE}/usr/share/hyphen"
 	configure_args+=" --with-parallelism=${XBPS_MAKEJOBS}"
 
 	# In theory we could use --with-lang=ALL but building the package then takes ages.
-	OPENCOLLADA_CFLAGS="-I${incdir}/opencollada/COLLADABaseUtils -I${incdir}/opencollada/COLLADAFramework -I${incdir}/opencollada/COLLADASaxFrameworkLoader -I${incdir}/opencollada/COLLADAStreamWriter -I${incdir}/opencollada/GeneratedSaxParser" \
-	OPENCOLLADA_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -lGeneratedSaxParser -lMathMLSolver -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lOpenCOLLADAStreamWriter -lUTF -lbuffer -lftoa" \
 	./configure ${configure_args} --with-lang='en-US de es fr it pl pt'
 
 	# Disable slowchecks target