diff --git a/srcpkgs/lightzone/template b/srcpkgs/lightzone/template
index ef464ddd357..aeabfde2b2e 100644
--- a/srcpkgs/lightzone/template
+++ b/srcpkgs/lightzone/template
@@ -1,28 +1,37 @@
 # Template file for 'lightzone'
 pkgname=lightzone
-reverts="4.2.0_1"
-version=4.1.9
-revision=2
+version=4.2.1
+revision=1
+_ivy_version=2.4.0
 wrksrc=LightZone-${version}
-hostmakedepends="automake git openjdk8 apache-ant javahelp2 rsync pkg-config"
-makedepends="libgomp-devel lcms2-devel libX11-devel"
-depends="virtual?java-runtime javahelp2 liblzma tiff"
+hostmakedepends="automake git openjdk11 apache-ant javahelp2 rsync pkg-config"
+makedepends="libgomp-devel lcms2-devel libjpeg-turbo-devel tiff-devel libX11-devel lensfun-devel"
+depends="openjdk11 javahelp2 liblzma tiff"
 short_desc="Professional-level digital darkroom and photo editor"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="BSD-3-clause"
+license="BSD-3-Clause"
 homepage="http://www.lightzoneproject.org/"
-distfiles="https://github.com/ktgw0316/LightZone/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=b7400ccee7554bc563b47c02af28a0abd4840efa6502984fd83b18bfd337e0f6
-nocross="Cross building dcraw_lz is not supported"
+distfiles="https://github.com/ktgw0316/LightZone/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz
+ https://repo1.maven.org/maven2/org/apache/ivy/ivy/${_ivy_version}/ivy-${_ivy_version}.jar"
+checksum="00319c1c41f4929484af3147985960d7aafe352fbd4477de9fe8edf210ad5df7
+ ce81cb234406b093b5b8de9f6f5b2a50ed0824d6a235891353e8d3e941a53970"
+skip_extraction="ivy-${_ivy_version}.jar"
 # JNI binaries are not PIE
 nopie=yes
 replaces="lightzone-bin>=0"
 
 do_build() {
-	vsed -i lightcrafts/build.xml -e "s;http://repo2.maven.org/;https://repo1.maven.org/;"
-	export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
+	mkdir -p lightcrafts/lib
+	ln -sf $XBPS_SRCDISTDIR/${pkgname}-${version}/ivy-${_ivy_version}.jar \
+		lightcrafts/lib/ivy.jar
+
+	# Fix for cross building
+	vsed -i lightcrafts/jnisrc/tiff/GNUmakefile \
+		-e "s;\./configure;& --host=${XBPS_MACHINE%-musl};"
+
+	. /etc/profile.d/10_openjdk11.sh
 	cd linux
-	ant jar
+	TARGET=${XBPS_TARGET_MACHINE%-musl} ant jar
 }
 
 do_install() {