diff --git a/srcpkgs/jmol/template b/srcpkgs/jmol/template
index 9e59e9afba8..e259a1a6618 100644
--- a/srcpkgs/jmol/template
+++ b/srcpkgs/jmol/template
@@ -1,30 +1,35 @@
-# Template for 'jmol'
+# Template file for 'jmol'
 pkgname=jmol
-version=14.29.17
+version=14.29.29
 revision=1
 noarch=yes
-maintainer="Brenton Horne <brentonhorne77@gmail.com>"
-homepage="http://jmol.sourceforge.net/"
 hostmakedepends="unzip"
 depends="virtual?java-environment"
+short_desc="Open-source Java/JavaScript-based molecule viewer"
+maintainer="Brenton Horne <brentonhorne77@gmail.com>"
 license="LGPL-2.1-or-later"
-short_desc="An open-source Java/JavaScript-based molecule viewer"
+homepage="http://jmol.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/jmol/Jmol/Version%20${version%.*}/Jmol%20${version}/Jmol-${version}-binary.tar.gz
  http://jmol.sourceforge.net/images/Jmol_icon_128.png"
-skip_extraction="Jmol_icon_128.png"
-checksum="5347e0df0781620d8e1cb7b933cd76ca04d19aef57ceea1b153f2988e25eddb6
+checksum="840f96f557a768f4fd021c4c552c6e1f5527e44d5a5500fde7db3dc569396048
  d84e5e4b5c9b440b3b90432db87e0d4bd5c8237d7d2891c174fac71f0a5a2127"
+skip_extraction="Jmol_icon_128.png"
+nocross="openjdk is nocross"
+
+case "$XBPS_TARGET_MACHINE" in
+	*-musl) broken="java not available";;
+esac
 
 do_install() {
 	vmkdir usr/bin
-	vmkdir usr/share/${pkgname}
+	vmkdir usr/share/jmol
 
 	unzip jsmol.zip -d "${DESTDIR}"/usr/share/
 	rm jsmol.zip
 
-	cp *.jar jmol.sh "${DESTDIR}"/usr/share/${pkgname}
-	ln -s /usr/share/${pkgname}/${pkgname}.sh "$DESTDIR"/usr/bin/${pkgname}
+	cp *.jar jmol.sh "${DESTDIR}"/usr/share/jmol
+	ln -s /usr/share/jmol/jmol.sh "$DESTDIR"/usr/bin/jmol
 
-	vinstall "${FILESDIR}/${pkgname}.desktop" 644 usr/share/applications
-	vinstall "${XBPS_SRCDISTDIR}/${pkgname}-${version}/Jmol_icon_128.png" 644 usr/share/pixmaps jmol.png
+	vinstall "${FILESDIR}/jmol.desktop" 644 usr/share/applications
+	vinstall "${XBPS_SRCDISTDIR}/jmol-${version}/Jmol_icon_128.png" 644 usr/share/pixmaps jmol.png
 }
diff --git a/srcpkgs/jmol/update b/srcpkgs/jmol/update
new file mode 100644
index 00000000000..2cf43fff8bc
--- /dev/null
+++ b/srcpkgs/jmol/update
@@ -0,0 +1 @@
+pattern='(?<!-)\b\Q'"$pkgname"'\E[-_]?((src|source)[-_])?\K([^-/_\s]*?\d[^-/_\s]*?)(?=(?:[-_.](?:src|source|orig|binary))?\.(?:[jt]ar|shar|t[bglx]z|tbz2|zip))\b'