diff --git a/pkgbuilds/herdr/PKGBUILD b/pkgbuilds/herdr/PKGBUILD
index 511885a7..259df78f 100644
--- a/pkgbuilds/herdr/PKGBUILD
+++ b/pkgbuilds/herdr/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: David Heinemeier Hansson <david@hey.com>
 
 pkgname=herdr
-pkgver=0.8.0.r13
+pkgver=0.8.2
 pkgrel=1
-pkgdesc="Herdr terminal workspace manager built from the Omarchy fork"
+pkgdesc="Herdr terminal workspace manager for AI coding agents"
 arch=('x86_64' 'aarch64')
-url="https://github.com/omacom-io/herdr"
+url="https://github.com/herdrdev/herdr"
 license=('Apache-2.0')
 depends=('gcc-libs' 'glibc')
 makedepends=('cargo')
@@ -13,23 +13,22 @@ replaces=('omarchy-herdr')
 conflicts=('omarchy-herdr')
 options=('!debug' '!lto')
 
-_commit=0766aa57ee0ceb4410ae064e94c0f0557853eee7
 _zigver=0.15.2
-source=("herdr-$_commit.tar.gz::$url/archive/$_commit.tar.gz")
+source=("herdr-$pkgver.tar.gz::$url/archive/refs/tags/v$pkgver.tar.gz")
 source_x86_64=("zig-x86_64-linux-$_zigver.tar.xz::https://ziglang.org/download/$_zigver/zig-x86_64-linux-$_zigver.tar.xz")
 source_aarch64=("zig-aarch64-linux-$_zigver.tar.xz::https://ziglang.org/download/$_zigver/zig-aarch64-linux-$_zigver.tar.xz")
-sha256sums=('61d33624fd3af77ccf695d20c3c31689a44f8c2dc3855edd405eec7bc1af0318')
+sha256sums=('60453051025ee44ebf055d26cdaf665a0accd99a992cddd22c166a26c49cd161')
 sha256sums_x86_64=('02aa270f183da276e5b5920b1dac44a63f1a49e55050ebde3aecc9eb82f93239')
 sha256sums_aarch64=('958ed7d1e00d0ea76590d27666efbf7a932281b3d7ba0c6b01b0ff26498f667f')
 
 prepare() {
-  cd "herdr-$_commit"
+  cd "herdr-$pkgver"
 
   cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
 }
 
 build() {
-  cd "herdr-$_commit"
+  cd "herdr-$pkgver"
 
   export CARGO_TARGET_DIR=target
   export ZIG="$srcdir/zig-$CARCH-linux-$_zigver/zig"
@@ -38,7 +37,7 @@ build() {
 }
 
 package() {
-  cd "herdr-$_commit"
+  cd "herdr-$pkgver"
 
   install -Dm755 target/release/herdr "$pkgdir/usr/bin/herdr"
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"