diff --git a/moonset-git/.SRCINFO b/moonset/.SRCINFO
similarity index 63%
rename from moonset-git/.SRCINFO
rename to moonset/.SRCINFO
index fae3c39..f33a94a 100644
--- a/moonset-git/.SRCINFO
+++ b/moonset/.SRCINFO
@@ -1,7 +1,7 @@
-pkgbase = moonset-git
+pkgbase = moonset
 	pkgdesc = A Wayland session power menu with GTK4 and Layer Shell
-	pkgver = 0.8.5.r0.g8285bcd
-	pkgrel = 2
+	pkgver = 0.8.5
+	pkgrel = 1
 	url = https://gitea.moonarch.de/nevaforget/moonset
 	arch = x86_64
 	license = MIT
@@ -12,9 +12,9 @@ pkgbase = moonset-git
 	makedepends = pkgconf
 	depends = gtk4
 	depends = gtk4-layer-shell
-	provides = moonset
-	conflicts = moonset
-	source = git+https://gitea.moonarch.de/nevaforget/moonset.git
+	conflicts = moonset-git
+	replaces = moonset-git
+	source = git+https://gitea.moonarch.de/nevaforget/moonset.git#tag=v0.8.5
 	sha256sums = SKIP
 
-pkgname = moonset-git
+pkgname = moonset
diff --git a/moonset-git/PKGBUILD b/moonset/PKGBUILD
similarity index 70%
rename from moonset-git/PKGBUILD
rename to moonset/PKGBUILD
index a009273..82dfac8 100644
--- a/moonset-git/PKGBUILD
+++ b/moonset/PKGBUILD
@@ -1,11 +1,11 @@
 # ABOUTME: PKGBUILD for Moonset — Wayland session power menu.
-# ABOUTME: Builds from git source with automatic version detection.
+# ABOUTME: Builds from a versioned git tag.
 
 # Maintainer: Dominik Kressler
 
-pkgname=moonset-git
-pkgver=0.8.5.r0.g8285bcd
-pkgrel=2
+pkgname=moonset
+pkgver=0.8.5
+pkgrel=1
 pkgdesc="A Wayland session power menu with GTK4 and Layer Shell"
 arch=('x86_64')
 url="https://gitea.moonarch.de/nevaforget/moonset"
@@ -21,16 +21,11 @@ makedepends=(
     'gtk4-layer-shell'
     'pkgconf'
 )
-provides=('moonset')
-conflicts=('moonset')
-source=("git+${url}.git")
+replaces=('moonset-git')
+conflicts=('moonset-git')
+source=("git+${url}.git#tag=v$pkgver")
 sha256sums=('SKIP')
 
-pkgver() {
-    cd "$srcdir/moonset"
-    git describe --long --tags | sed 's/^v//;s/-/.r/;s/-/./'
-}
-
 build() {
     cd "$srcdir/moonset"
     cargo build --release