diff --git a/srcpkgs/libreoffice-firebird b/srcpkgs/libreoffice-firebird
deleted file mode 120000
index d5e3a56f350..00000000000
--- a/srcpkgs/libreoffice-firebird
+++ /dev/null
@@ -1 +0,0 @@
-libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 20f266aa5e0..f337dab38e7 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,14 +1,13 @@
-#!/bin/sh
 # Template file for 'libreoffice'
 pkgname=libreoffice
-version=6.2.4.2
+version=6.2.5.2
 revision=1
 build_style=meta
 make_build_args="build-nocheck"
 nocross=yes
 
 #
-# XXX: mit-krb5-devel nasm firebird3 hamcrest iwyu ogl-math poppler
+# XXX: mit-krb5-devel nasm hamcrest iwyu ogl-math poppler
 # Missing, required libraries are downloaded and built internally
 #
 hostmakedepends="automake flex git gperf hyphen icu libtool openldap
@@ -17,7 +16,7 @@ makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel
  frameworkintegration-devel glyphy-devel gpgmepp-devel gst-plugins-base1-devel
  gtk+-devel gtk+3-devel hunspell-devel hyphen-devel libXt-devel libabw-devel
  libatomic_ops-devel libbluetooth-devel libcdr-devel libcmis-devel libe-book-devel
- libepubgen-devel libetonyek-devel libexttextcat-devel libfreehand-devel
+ libepubgen-devel libetonyek-devel libexttextcat-devel libfbclient3-devel libfreehand-devel
  libgcrypt-devel libgltf-devel libldap-devel libmariadbclient-devel libmspub-devel
  libmwaw-devel libnumbertext-devel libodfgen-devel liborcus-devel
  libpagemaker-devel libqxp-devel librsvg-devel libvisio-devel libwpg-devel
@@ -29,7 +28,6 @@ depends+=" libreoffice-base>=${version}_${revision}"
 depends+=" libreoffice-calc>=${version}_${revision}"
 depends+=" libreoffice-draw>=${version}_${revision}"
 depends+=" libreoffice-fonts>=${version}_${revision}"
-depends+=" libreoffice-firebird>=${version}_${revision}"
 depends+=" libreoffice-gnome>=${version}_${revision}"
 depends+=" libreoffice-impress>=${version}_${revision}"
 depends+=" libreoffice-math>=${version}_${revision}"
@@ -69,7 +67,6 @@ distfiles="
  ${_addurl}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
  ${_addurl}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
  ${_addurl}/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
- ${_addurl}/Firebird-3.0.0.32483-0.tar.bz2
  ${_addurl}/libstaroffice-0.0.6.tar.xz
  ${_addurl}/libzmf-0.0.2.tar.xz
  ${_addurl}/pdfium-3550.tar.bz2
@@ -81,6 +78,7 @@ distfiles="
  ${_addurl}/commons-logging-1.2-src.tar.gz
  ${_addurl}/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip
  ${_addurl}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
+ ${_addurl}/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
  ${_addurl}/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
  ${_addurl}/b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt
  ${_addurl}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
@@ -117,10 +115,10 @@ distfiles="
  ${_addurl}/ReemKufi-0.7.zip
  ${_addurl}/Scheherazade-2.100.zip
 "
-checksum="ff8148e7a7bc8988677ca565d6d25c1ade93e848df6b4163459a5cc3682a38b7
- 21d16b922d7a218dd104571ae37421fcbc1ae90e5fd61c7b16fee33e4ac4e057
- 1aa5469a25d4a615b521d0775b08501ea4672994c5135bcde7c054c327aa2e7f
- 4c4cf8e26b14e508f1a1fdf2db1a2363964ae5d528b5bd5f048a281ddecc1e2a
+checksum="0e9c00e9b17ee2d35415c6baafe13d16a891253477b8cecf1942f0035aac358e
+ d7161ad5fdc54ebad0ac6476d4b0b4acb4b26c891b03f3e802f2f49faa31969f
+ 327f74590f60e9b0a58f5ab54304cdace248c9f1b45fd486a687481b715043d6
+ c39781ef5dc6602393c8cb2f7442c154385e9b89f13fce0e1f4ba600321e9d0a
  1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
  75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
  983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776
@@ -129,7 +127,6 @@ checksum="ff8148e7a7bc8988677ca565d6d25c1ade93e848df6b4163459a5cc3682a38b7
  1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
  233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
  48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d
- 6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860
  6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4
  27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22
  572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679
@@ -141,6 +138,7 @@ checksum="ff8148e7a7bc8988677ca565d6d25c1ade93e848df6b4163459a5cc3682a38b7
  49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81
  9e93c73e23aff644b17dfff656444474c14150e7f3b38b19635e622235e01c96
  64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1
+ ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab
  71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e6453f4d85de3
  1568ed1d2feb8210bb5de61d69574a165cded536cfa17c6953c9064076469de2
  75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba
@@ -200,6 +198,7 @@ skip_extraction="
  commons-logging-1.2-src.tar.gz
  beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip
  35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
+ 48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
  1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
  b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt
  eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
@@ -236,6 +235,7 @@ skip_extraction="
  ReemKufi-0.7.zip
  Scheherazade-2.100.zip
 "
+replaces="libreoffice-firebird<6.2.4.2_1"
 
 build_options="java"
 desc_option_java="Enable Java support"
@@ -280,7 +280,7 @@ _split() {
 	fi
 }
 
-_languages=""
+declare _languages
 _add_lang() {
 	local pkglang="${3:-$1}"
 	_languages="$_languages ${pkglang//_/-}"
@@ -427,13 +427,6 @@ do_configure() {
 		-e "s|.1.gz|.1|g"
 	chmod +x bin/unpack-sources
 
-	# Add musl patch for firebird
-	mkdir -p external/firebird
-	cp ${FILESDIR}/musl-os_utils_h.patch external/firebird/
-	sed -i external/firebird/UnpackedTarball_firebird.mk \
-		-e's;\(.*external/firebird\)/libc++.patch\(.*\)$;\1/libc++.patch\2\n\1/musl-os_utils_h.patch\2;'
-
-
 	case "$XBPS_TARGET_MACHINE" in
 		i686*)	# Don't run broken tests
 			sed -i "/CppunitTest_sw_ooxmlexport9/d" sw/Module_sw.mk
@@ -498,7 +491,6 @@ do_configure() {
 	opts+=" --without-system-poppler"
 	# xmlsec1-nss is missing, thus don't use system-xmlsec
 	opts+=" --without-system-xmlsec"
-	opts+=" --without-system-firebird"
 	opts+=" --without-system-libzmf"
 	opts+=" --without-system-libstaroffice"
 	opts+=" --without-system-libtommath"
@@ -567,21 +559,6 @@ libreoffice-draw_package() {
 	}
 }
 
-libreoffice-firebird_package() {
-	short_desc+=" - Connector for Firebird SDBC"
-	noverifyrdeps=yes
-	pkg_install() {
-		vmkdir usr/lib/libreoffice/program
-		for f in libEngine12.so libfbclient.so.2 libfirebird_sdbclo.so; do
-			mv ${DESTDIR}/all/usr/lib/libreoffice/program/${f} \
-				${PKGDESTDIR}/usr/lib/libreoffice/program/
-		done
-		vmkdir usr/lib/libreoffice/share
-		mv ${DESTDIR}/all/usr/lib/libreoffice/share/firebird \
-			${PKGDESTDIR}/usr/lib/libreoffice/share/
-	}
-}
-
 libreoffice-fonts_package() {
 	short_desc+=" - Fonts"
 	archs=noarch