diff --git a/expat/.SRCINFO b/expat/.SRCINFO
new file mode 100644
index 0000000000..14fdb422fb
--- /dev/null
+++ b/expat/.SRCINFO
@@ -0,0 +1,17 @@
+pkgbase = expat
+	pkgdesc = An XML parser library
+	pkgver = 2.6.3
+	pkgrel = 2
+	url = https://libexpat.github.io/
+	arch = x86_64
+	license = MIT
+	makedepends = cmake
+	makedepends = git
+	depends = glibc
+	provides = libexpat.so
+	source = expat::git+https://github.com/libexpat/libexpat?signed#tag=R_2_6_3
+	validpgpkeys = 3176EF7DB2367F1FCA4F306B1F9B0E909AF37285
+	sha512sums = d4845acf87f1b14a5bedeac8effbc4d292f7a1fafa28ea3159f74ccaeef19af3ad48a0398367c2a6e45b9a151c3c3f59b462922d5a615846ab11b9a144b09e91
+	b2sums = 57bb71f8ad2211127281d22ffebdb1cb1b023081eb83eca2843c9e6b99d3ad4570cc885889a9d80c90c4a8e9c8d5331c04b4f61e711bb0546cb4234636255106
+
+pkgname = expat
diff --git a/expat/.nvchecker.toml b/expat/.nvchecker.toml
new file mode 100644
index 0000000000..4e6a15ff89
--- /dev/null
+++ b/expat/.nvchecker.toml
@@ -0,0 +1,6 @@
+[expat]
+source = "git"
+git = "https://github.com/libexpat/libexpat/"
+include_regex = "(R_)([\\d.*][_].*)"
+from_pattern = 'R_(\d)_(\d)_(\d)'
+to_pattern = '\1.\2.\3'
diff --git a/expat/PKGBUILD b/expat/PKGBUILD
index 2ecb9d5019..e90c9e7a72 100644
--- a/expat/PKGBUILD
+++ b/expat/PKGBUILD
@@ -5,20 +5,22 @@
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=expat
-pkgver=2.6.2
-pkgrel=1
+pkgver=2.6.3
+pkgrel=2
 pkgdesc="An XML parser library"
 arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
 url="https://libexpat.github.io/"
+_url="https://github.com/libexpat/libexpat"
 license=(MIT)
 depends=(glibc)
-makedepends=(cmake)
+makedepends=(
+  cmake
+  git
+)
 provides=(libexpat.so)
-source=(https://github.com/libexpat/libexpat/releases/download/R_${pkgver//./_}/$pkgname-$pkgver.tar.bz2{,.asc})
-sha512sums=('15811413e92a632272188781cc3f2a9e52ed62f6edfad9b2eeeca0946e53132b6c9ca6dc460eda766d6a4e68e5920128335d705f9556b5aa3f77593658780470'
-            'SKIP')
-b2sums=('9b518cf768e53b177fd933d37686a76c4a1bd1e2829cf414f8f9c054901f61d6445232eb4d4502e888507efa12a48d8ace206fbabac5d2ca5365f0437e971fd8'
-        'SKIP')
+source=($pkgname::git+$_url?signed#tag=R_${pkgver//./_})
+sha512sums=('d4845acf87f1b14a5bedeac8effbc4d292f7a1fafa28ea3159f74ccaeef19af3ad48a0398367c2a6e45b9a151c3c3f59b462922d5a615846ab11b9a144b09e91')
+b2sums=('57bb71f8ad2211127281d22ffebdb1cb1b023081eb83eca2843c9e6b99d3ad4570cc885889a9d80c90c4a8e9c8d5331c04b4f61e711bb0546cb4234636255106')
 validpgpkeys=(3176EF7DB2367F1FCA4F306B1F9B0E909AF37285) # Sebastian Pipping
 
 build() {
@@ -26,7 +28,7 @@ build() {
     -B build
     -D CMAKE_BUILD_TYPE=None
     -D CMAKE_INSTALL_PREFIX=/usr
-    -S $pkgname-$pkgver
+    -S $pkgname/$pkgname
     -W no-dev
   )
 
@@ -40,6 +42,6 @@ check() {
 
 package() {
   DESTDIR="$pkgdir" cmake --install build
-  install -vDm 644 $pkgname-$pkgver/COPYING -t "$pkgdir/usr/share/licenses/$pkgname/"
-  install -vDm 644 $pkgname-$pkgver/{AUTHORS,Changes,README.md} -t "$pkgdir/usr/share/doc/$pkgname/"
+  install -vDm 644 $pkgname/$pkgname/COPYING -t "$pkgdir/usr/share/licenses/$pkgname/"
+  install -vDm 644 $pkgname/$pkgname/{AUTHORS,Changes,README.md} -t "$pkgdir/usr/share/doc/$pkgname/"
 }