diff --git a/common/shlibs b/common/shlibs
index e4c1a25670..803b094e51 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1486,6 +1486,7 @@ libaqofxconnect.so.7 aqbanking-5.0.25_1
 libaqebics.so.0 aqbanking-5.0.25_1
 libaqbankingpp.so.0 aqbanking-5.0.25_1
 libxmlsec1.so.1 xmlsec1-1.2.19_1
+libxmlsec1-nss.so.1 xmlsec1-1.2.28_2
 libcheck.so.0 check-0.9.12_1
 liblxc.so.1 liblxc-1.0.0_1
 libtcmalloc.so.4 gperftools-2.1_1
diff --git a/srcpkgs/libreoffice/files/icu-cplusplus.patch.0 b/srcpkgs/libreoffice/files/icu-cplusplus.patch.0
deleted file mode 100644
index f55e55d7ab..0000000000
--- a/srcpkgs/libreoffice/files/icu-cplusplus.patch.0
+++ /dev/null
@@ -1,36 +0,0 @@
-From d0c7516dd97599fb59d8616e8adf94f19ec48de1 Mon Sep 17 00:00:00 2001
-From: Miklos Vajna <vmiklos@collabora.com>
-Date: Fri, 29 Mar 2019 13:47:12 +0100
-Subject: [PATCH] base64: move start of C++ guard below includes
-
-Resolves problems around building against newer ICU, see
-<https://lists.freedesktop.org/archives/libreoffice/2019-March/082340.html>.
----
- include/xmlsec/base64.h | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- include/xmlsec/base64.h
-+++ include/xmlsec/base64.h
-@@ -11,15 +11,15 @@
- #ifndef __XMLSEC_BASE64_H__
- #define __XMLSEC_BASE64_H__
- 
--#ifdef __cplusplus
--extern "C" {
--#endif /* __cplusplus */
--
- #include <libxml/tree.h>
- 
- #include <xmlsec/xmlsec.h>
- #include <xmlsec/transforms.h>
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif /* __cplusplus */
-+
- /**
-  * XMLSEC_BASE64_LINESIZE:
-  *
--- 
-2.16.4
-
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 5dfc53d292..7973ff6974 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -22,7 +22,8 @@ makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel
  libpagemaker-devel libqxp-devel librsvg-devel libvisio-devel libwpg-devel
  libwps-devel lpsolve-devel mdds mythes-devel neon-devel nss-devel
  postgresql-libs-devel python3-devel qt5-devel redland-devel sane-devel
- telepathy-glib-devel unixodbc-devel vigra-devel vlc-devel libcppunit-devel"
+ telepathy-glib-devel unixodbc-devel vigra-devel vlc-devel libcppunit-devel
+ xmlsec1-devel"
 depends="libreoffice-common>=${version}_${revision}"
 depends+=" libreoffice-base>=${version}_${revision}"
 depends+=" libreoffice-calc>=${version}_${revision}"
@@ -92,7 +93,6 @@ distfiles="
  ${_addurl}/7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
  ${_addurl}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
  ${_addurl}/ltm-1.0.zip
- ${_addurl}/xmlsec1-1.2.27.tar.gz
  ${_addurl}/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz
  ${_addurl}/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz
  ${_addurl}/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip
@@ -152,7 +152,6 @@ checksum="0e9c00e9b17ee2d35415c6baafe13d16a891253477b8cecf1942f0035aac358e
  a25f14dad39e93a2f9cdf09166ee53981f7212dce829e4208e07a522963a8585
  085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045
  083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483
- 97d756bad8e92588e6997d2227797eaa900d05e34a426829b149f65d87118eb6
  c48d1c2fd613c9c06c959c34da7b8388059e2408d2bb19845dc3ed35f76e4d09
  4bd12b6cbc321c1cf16da76e2c585c925ce956a08067ae6f6c64eff6ccfdaf5a
  7576310b219e04159d35ff61dd4a4ec4cdba4f35c00e002a136f00e96a908b0a
@@ -212,7 +211,6 @@ skip_extraction="
  7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
  39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
  ltm-1.0.zip
- xmlsec1-1.2.27.tar.gz
  368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz
  c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz
  33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip
@@ -417,9 +415,6 @@ post_fetch() {
 			ln -svf ${srcdistdir}/${pkg} ${wrksrc}/external/tarballs/
 		fi
 	done
-
-	cp ${FILESDIR}/icu-cplusplus.patch.0 ${wrksrc}/external/xmlsec
-	sed -i 's/xmlsec_patches :=/& icu-cplusplus.patch.0/' ${wrksrc}/external/xmlsec/UnpackedTarball_xmlsec.mk
 }
 
 do_configure() {
@@ -492,8 +487,6 @@ do_configure() {
 	opts+=" --with-tls=nss"
 	# fails to build with system poppler
 	opts+=" --without-system-poppler"
-	# xmlsec1-nss is missing, thus don't use system-xmlsec
-	opts+=" --without-system-xmlsec"
 	opts+=" --without-system-libzmf"
 	opts+=" --without-system-libstaroffice"
 	opts+=" --without-system-libtommath"