diff --git a/extra/libreoffice-still/PKGBUILD b/extra/libreoffice-still/PKGBUILD
index 036add091..49bb1c890 100644
--- a/extra/libreoffice-still/PKGBUILD
+++ b/extra/libreoffice-still/PKGBUILD
@@ -20,8 +20,8 @@ pkgbase=libreoffice-still
 pkgname=('libreoffice-still-sdk' 'libreoffice-still')
 _LOver=5.3.7.2
 pkgver=5.3.7
-pkgrel=5
-arch=('i686' 'x86_64')
+pkgrel=6
+arch=('x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
 makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.6' 'libwpd>=0.9.2' 'libwps'
@@ -69,6 +69,7 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
 	${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
 	${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 	${_additional_source_url}/libfreehand-0.1.1.tar.bz2
+	${_additional_source_url}/1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz
 	${_additional_source_url}/libstaroffice-0.0.2.tar.bz2
 	${_additional_source_url}/Firebird-3.0.0.32483-0.tar.bz2
 	${_additional_source_url2}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar  # for test suite
@@ -104,7 +105,7 @@ noextract=(boost_1_60_0.tar.bz2
 	Firebird-3.0.0.32483-0.tar.bz2
 	8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
 	a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar
-	976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz
+	1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz
 	185d60944ea767075d27247c3162b3bc-unowinreg.dll)
 validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build@documentfoundation.org>
 sha256sums=('c3d7ceecdf4d97dfd2ed748c4479152a1c9b8c879587a63a4f403209aed6ee7c'
@@ -137,6 +138,7 @@ sha256sums=('c3d7ceecdf4d97dfd2ed748c4479152a1c9b8c879587a63a4f403209aed6ee7c'
             '1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133'
             '233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd'
             '45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877'
+            '0eb46ba3746a9c2092c8ad347a29b1a1b4941144772d13a88667a7b11ea30309'
             'f06eb29d13357f1aa1944de0be1162de05d9f9333b5f54e9bf762415029a8899'
             '6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860'
             'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770'
@@ -251,7 +253,7 @@ build() {
 		--with-jdk-home="/usr/lib/jvm/default" \
 		--with-ant-home="/usr/share/apache-ant"\
 		--without-system-boost\
-		--with-system-icu \
+		--without-system-icu \
 		--with-system-cairo \
 		--with-system-libs \
 		--with-system-mythes \
@@ -265,12 +267,12 @@ build() {
 
 	touch src.downloaded
 
-	# many tests are broken when crossbuilding i686
-	if [ "$CARCH" = "x86_64" ]; then
-	   make build
-	else
-	   make build-nocheck
-	fi
+	make build-nocheck || {
+		# https://ssl.icu-project.org/trac/ticket/13329
+		sed -i 's/xlocale/locale/' \
+			workdir/UnpackedTarball/icu/source/i18n/digitlst.cpp
+		make build-nocheck
+	}
 
 	mkdir ${srcdir}/fakeinstall
 	make DESTDIR=${srcdir}/fakeinstall distro-pack-install
@@ -313,7 +315,7 @@ package_libreoffice-still() {
 	pkgdesc="LibreOffice maintenance branch"
 	depends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.6' 'libwpd>=0.9.2' 'libwps'
 		'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib'
-		'libxslt' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'icu' 
+		'libxslt' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' #'icu'
 		'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'
 		'libmspub' 'harfbuzz-icu' 'glew' 'nss' 'clucene' 'hicolor-icon-theme'
 		'desktop-file-utils' 'shared-mime-info' 'glu' 'libpagemaker'