diff --git a/srcpkgs/xrootconsole/template b/srcpkgs/xrootconsole/template
index 0192cbbbf0..029212328a 100644
--- a/srcpkgs/xrootconsole/template
+++ b/srcpkgs/xrootconsole/template
@@ -1,19 +1,20 @@
 # Template file for 'xrootconsole'
 pkgname=xrootconsole
-version=0.6r3
-revision=3
+reverts=0.6r3_3
+version=0.6.4
+revision=1
 create_wrksrc=yes
-build_wrksrc="${pkgname}-${version%r*}"
+build_wrksrc="xrootconsole-${version%.*}"
 build_style=gnu-makefile
 makedepends="libX11-devel"
 short_desc="Fancy X console display"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://packages.debian.org/source/sid/xrootconsole"
-distfiles="${DEBIAN_SITE}/main/x/${pkgname}/${pkgname}_${version%r*}.orig.tar.gz
- ${DEBIAN_SITE}/main/x/${pkgname}/${pkgname}_${version/r/-}.debian.tar.gz"
+distfiles="${DEBIAN_SITE}/main/x/xrootconsole/xrootconsole_${version%.*}.orig.tar.gz
+ ${DEBIAN_SITE}/main/x/xrootconsole/xrootconsole_${version%.*}-${version##*.}.debian.tar.xz"
 checksum="8306de6f4d3f39677334ee65214e46729cf2dd89aeff1705df3c499738a4076d
- 67a511d19e0f2ead7e57850e0fa73f0932d329a9849d0aba48a03661c0d6737a"
+ 4d9429c1588d3be7b47eeba6f06371184e71562a439ec9fcacc340776b845f41"
 
 post_extract() {
 	for p in debian/patches/*.patch; do
diff --git a/srcpkgs/xrootconsole/update b/srcpkgs/xrootconsole/update
new file mode 100644
index 0000000000..e7ec7ee23c
--- /dev/null
+++ b/srcpkgs/xrootconsole/update
@@ -0,0 +1 @@
+pattern='(?<!-)\b\Q'"$pkgname"'\E[-_]?((src|source)[-_])?\K([^-/_\s]*?\d[^/_\s]*?)(?=(?:[-_.](?:|debian|src|source|orig))?\.(?:[jt]ar|shar|t[bglx]z|tbz2|zip))\b'