diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 0000000..b0c9abb
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,15 @@
+pkgbase = vieter-vls
+	pkgdesc = Language server for the V programming language; synced with the vieter-v compiler.
+	pkgver = r582.5ad842f
+	pkgrel = 1
+	url = https://github.com/vlang/vls
+	arch = x86_64
+	arch = aarch64
+	license = MIT
+	makedepends = git
+	depends = glibc
+	depends = vieter-v
+	source = vieter-vls::git+https://github.com/vlang/vls
+	md5sums = SKIP
+
+pkgname = vieter-vls
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c6a9b95
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+*
+
+!.gitignore
+!PKGBUILD
+!.SRCINFO
diff --git a/PKGBUILD b/PKGBUILD
index 2901682..3ea10cd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,30 @@
 # Maintainer: Jef Roosens
 
 pkgname=vieter-vls
-pkgver=latest.r0.g5fbfe67
+pkgver=r582.5ad842f
 pkgrel=1
-pkgdesc="Language server for the V programming language; synced with the vieter-v compiler."
-arch=("x86_64" "aarch64")
+pkgdesc='Language server for the V programming language; synced with the vieter-v compiler.'
+arch=('x86_64' 'aarch64')
 
-url="https://github.com/vlang/vls"
-license=("MIT")
+url='https://github.com/vlang/vls'
+license=('MIT')
 
-depends=("glibc" "vieter-v")
-makedepends=("git")
+depends=('glibc' 'vieter-v')
+makedepends=('git')
 
-source=("$pkgname::git+https://github.com/vlang/vls")
-md5sums=("SKIP")
+source=("${pkgname}::git+https://github.com/vlang/vls")
+md5sums=('SKIP')
 
 pkgver() {
-    git -C "$pkgname" describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+    cd "${pkgname}"
+
+    echo "r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
 }
 
 build() {
-    cd "$pkgname"
+    cd "${pkgname}"
 
-    msg "Building VLS..."
-    # I would use -d dynamic_boehm here, but vls seems to segfault when I do
-    # this, strange.
-    v -cc gcc -gc boehm -prod cmd/vls
+    v run build.vsh gcc
 
     msg "Building treesitter grammar..."
 
@@ -36,14 +35,14 @@ build() {
 
 package() {
     # Install vls
-    install -dm755 "$pkgdir/usr/bin"
-    install -Dm755 "$pkgname/cmd/vls/vls" "$pkgdir/usr/bin/vls"
-    install -Dm644 "$pkgname/LICENSE" -t "$pkgdir/usr/share/licenses/$pkgname"
+    install -dm755 "${pkgdir}/usr/bin"
+    install -Dm755 "${pkgname}/bin/vls" "${pkgdir}/usr/bin/vls"
+    install -Dm644 "${pkgname}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 
     # Install treesitter grammar
     # This package installs the parser & queries for Neovim in its runtimepath
-    install -dm755 "$pkgdir/usr/share/nvim/runtime/parser"
-    install -dm755 "$pkgdir/usr/share/nvim/runtime/queries/v"
-    install -Dm755 "$pkgname/tree_sitter_v/tree_sitter_v.so" "$pkgdir/usr/share/nvim/runtime/parser/v.so"
-    install -m644 "$pkgname/tree_sitter_v/queries"/* "$pkgdir/usr/share/nvim/runtime/queries/v"
+    install -dm755 "${pkgdir}/usr/share/nvim/runtime/parser"
+    install -dm755 "${pkgdir}/usr/share/nvim/runtime/queries/v"
+    install -Dm755 "${pkgname}/tree_sitter_v/tree_sitter_v.so" "${pkgdir}/usr/share/nvim/runtime/parser/v.so"
+    install -m644 "${pkgname}/tree_sitter_v/queries"/* "${pkgdir}/usr/share/nvim/runtime/queries/v"
 }