diff --git a/srcpkgs/libxklavier/template b/srcpkgs/libxklavier/template
index e81d44d8d7..6e8452dfba 100644
--- a/srcpkgs/libxklavier/template
+++ b/srcpkgs/libxklavier/template
@@ -1,18 +1,19 @@
-# Template build file for 'libxklavier'.
+# Template file for 'libxklavier'
 pkgname=libxklavier
-version=5.3
-revision=4
+version=5.4
+revision=1
 build_style=gnu-configure
-configure_args="--disable-static"
-hostmakedepends="pkg-config glib-devel"
-makedepends="libglib-devel libxkbfile-devel libxml2-devel libXi-devel xkeyboard-config iso-codes"
+configure_args="--disable-static $(vopt_enable gir introspection)"
+hostmakedepends="pkg-config glib-devel $(vopt_if gir gobject-introspection)"
+makedepends="libglib-devel libxkbfile-devel libxml2-devel libXi-devel
+ xkeyboard-config iso-codes"
 depends="xkeyboard-config iso-codes"
 short_desc="Library providing high-level API for X Keyboard Extension"
-homepage="http://freedesktop.org/wiki/Software/LibXklavier"
-license="LGPL-2"
+homepage="https://freedesktop.org/wiki/Software/LibXklavier/"
+license="LGPL-2.0-or-later"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
-distfiles="${GNOME_SITE}/$pkgname/5.3/$pkgname-$version.tar.xz"
-checksum=ebec3bc54b5652838502b96223152fb1cd8fcb14ace5cb02d718fc3276bbd404
+distfiles="https://people.freedesktop.org/~svu/libxklavier-${version}.tar.bz2"
+checksum=17a34194df5cbcd3b7bfd0f561d95d1f723aa1c87fca56bc2c209514460a9320
 
 # Package build options
 build_options="gir"
@@ -21,16 +22,9 @@ if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="gir"
 fi
 
-if [ "$build_option_gir" ]; then
-	configure_args+=" --enable-introspection"
-	makedepends+=" gobject-introspection"
-else
-	configure_args+=" --disable-introspection"
-fi
-
 libxklavier-devel_package() {
-	depends="libglib-devel libxml2-devel>=2.7.8 ${sourcepkg}>=${version}_${revision}"
-	short_desc+=" -- development files"
+	depends="libglib-devel libxml2-devel ${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/share