diff --git a/extra/aom/PKGBUILD b/extra/aom/PKGBUILD
index eafe41b63..af4c9ee7c 100644
--- a/extra/aom/PKGBUILD
+++ b/extra/aom/PKGBUILD
@@ -7,19 +7,29 @@
 pkgbase=aom
 pkgname=(aom aom-docs)
 pkgver=3.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Alliance for Open Media video codec"
 url="https://aomedia.org/"
 arch=(x86_64)
 license=(BSD custom:PATENTS)
 depends=(gcc-libs)
 makedepends=(git cmake ninja doxygen yasm)
-source=("$pkgbase-$pkgver.tar.gz::https://aomedia.googlesource.com/aom/+archive/v$pkgver.tar.gz")
-b2sums=('572af4b99669f2aff52748446fe985373fdfabe9dedfcc484c8346937a6adb80c60e251126ca529c75f6ace24c6c9a9d71bbf7eede49f07a97fde57ee04494ad')
+_commit=d853caa2ab62d161e5edf344ffee7b597449dc0d  # tags/v3.0.0^0
+source=("git+https://aomedia.googlesource.com/aom#commit=$_commit")
+b2sums=('SKIP')
+
+pkgver() {
+  cd $pkgbase
+  git describe --tags | sed 's/^v//;s/-errata/.errata/;s/-/+/g'
+}
+
+prepare() {
+  cd $pkgbase
+}
 
 build() {
   [[ $CARCH != "aarch64" ]] && CONFIG="-DAOM_TARGET_CPU=generic"
-  cmake -S . -B build -G Ninja \
+  cmake -S $pkgbase -B build -G Ninja \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DBUILD_SHARED_LIBS=1 \
     -DENABLE_TESTS=0 $CONFIG
@@ -31,7 +41,7 @@ package_aom() {
 
   DESTDIR="$pkgdir" cmake --install build
 
-  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 LICENSE PATENTS
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $pkgbase/{LICENSE,PATENTS}
 }
 
 package_aom-docs() {
@@ -39,9 +49,9 @@ package_aom-docs() {
   depends=()
 
   mkdir -p "$pkgdir/usr/share/doc"
-  cp -r build/docs/html "$pkgdir/usr/share/doc/$pkgname"
+  cp -r build/docs/html "$pkgdir/usr/share/doc/$pkgbase"
 
-  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 LICENSE PATENTS
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $pkgbase/{LICENSE,PATENTS}
 }
 
 # vim:set et sw=2: