diff --git a/moonlock-git/.SRCINFO b/moonlock/.SRCINFO
similarity index 72%
rename from moonlock-git/.SRCINFO
rename to moonlock/.SRCINFO
index 8aaa531..1e0a759 100644
--- a/moonlock-git/.SRCINFO
+++ b/moonlock/.SRCINFO
@@ -1,7 +1,7 @@
-pkgbase = moonlock-git
+pkgbase = moonlock
 	pkgdesc = A secure Wayland lockscreen with GTK4, PAM and fingerprint support
-	pkgver = 0.6.12.r1.g73c59e5
-	pkgrel = 5
+	pkgver = 0.6.17
+	pkgrel = 1
 	url = https://gitea.moonarch.de/nevaforget/moonlock
 	arch = x86_64
 	license = MIT
@@ -18,9 +18,9 @@ pkgbase = moonlock-git
 	depends = pam
 	depends = systemd-libs
 	optdepends = fprintd: fingerprint authentication support
-	provides = moonlock
-	conflicts = moonlock
-	source = git+https://gitea.moonarch.de/nevaforget/moonlock.git
+	conflicts = moonlock-git
+	replaces = moonlock-git
+	source = git+https://gitea.moonarch.de/nevaforget/moonlock.git#tag=v0.6.17
 	sha256sums = SKIP
 
-pkgname = moonlock-git
+pkgname = moonlock
diff --git a/moonlock-git/PKGBUILD b/moonlock/PKGBUILD
similarity index 76%
rename from moonlock-git/PKGBUILD
rename to moonlock/PKGBUILD
index 87e3d7f..87a8011 100644
--- a/moonlock-git/PKGBUILD
+++ b/moonlock/PKGBUILD
@@ -1,11 +1,11 @@
 # ABOUTME: PKGBUILD for Moonlock — secure Wayland lockscreen.
-# ABOUTME: Builds from git source with automatic version detection.
+# ABOUTME: Builds from a versioned git tag.
 
 # Maintainer: Dominik Kressler
 
-pkgname=moonlock-git
-pkgver=0.6.12.r1.g73c59e5
-pkgrel=5
+pkgname=moonlock
+pkgver=0.6.17
+pkgrel=1
 pkgdesc="A secure Wayland lockscreen with GTK4, PAM and fingerprint support"
 arch=('x86_64')
 url="https://gitea.moonarch.de/nevaforget/moonlock"
@@ -29,16 +29,11 @@ makedepends=(
 optdepends=(
     'fprintd: fingerprint authentication support'
 )
-provides=('moonlock')
-conflicts=('moonlock')
-source=("git+${url}.git")
+replaces=('moonlock-git')
+conflicts=('moonlock-git')
+source=("git+${url}.git#tag=v$pkgver")
 sha256sums=('SKIP')
 
-pkgver() {
-    cd "$srcdir/moonlock"
-    git describe --long --tags | sed 's/^v//;s/-/.r/;s/-/./'
-}
-
 build() {
     cd "$srcdir/moonlock"
     cargo build --release