diff --git a/srcpkgs/clucene/template b/srcpkgs/clucene/template
index 29a860bbef2..3c3cfc2b235 100644
--- a/srcpkgs/clucene/template
+++ b/srcpkgs/clucene/template
@@ -1,7 +1,7 @@
 # Template file for 'clucene'
 pkgname=clucene
 version=2.3.3.4
-revision=4
+revision=5
 wrksrc=${pkgname}-core-${version}
 build_style=cmake
 configure_args="-DENABLE_ASCII_MODE=OFF -DENABLE_PACKAGING=OFF
@@ -16,6 +16,17 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-core-${version}.tar.gz"
 checksum=ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab
 
+case "$XBPS_TARGET_MACHINE" in
+	*-musl) configure_args="-DICONV_SECOND_ARGUMENT_IS_CONST=0"
+esac
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" -D_CL_HAVE_PTHREAD_MUTEX_RECURSIVE_EXITCODE=0"
+	configure_args+=" -D_CL_HAVE_GCC_ATOMIC_FUNCTIONS_EXITCODE=0"
+	configure_args+=" -D_CL_HAVE_TRY_BLOCKS_EXITCODE=0"
+	configure_args+=" -D_CL_HAVE_NAMESPACES_EXITCODE=0"
+	configure_args+=" -D_CL_HAVE_NO_SNPRINTF_BUG_EXITCODE=0"
+	configure_args+=" -DLUCENE_STATIC_CONSTANT_SYNTAX_EXITCODE=0"
+fi
 clucene-devel_package() {
 	depends="libstdc++-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"