diff --git a/extra/aom/PKGBUILD b/extra/aom/PKGBUILD
index 7b11b554d..030bee9cc 100644
--- a/extra/aom/PKGBUILD
+++ b/extra/aom/PKGBUILD
@@ -5,35 +5,56 @@
 #  - cmake with -DAOM_TARGET_CPU=generic for !AArch64
 
 pkgbase=aom
-pkgname=(aom aom-docs)
-pkgver=3.6.0
+pkgname=(
+  aom
+  aom-docs
+)
+pkgver=3.6.1
 pkgrel=1
 pkgdesc="Alliance for Open Media video codec"
 url="https://aomedia.org/"
 arch=(x86_64)
-license=(BSD custom:PATENTS)
-depends=(gcc-libs)
-makedepends=(cmake ninja doxygen yasm)
-source=(https://storage.googleapis.com/aom-releases/libaom-$pkgver.tar.gz{,.asc})
-b2sums=('bf97c74f3e59e3cc2431e7b7e3494beffde1b659d1a8f8775b4b47da0c7314b8bf5b9bdf14a9d1d47a8378271f49c9e26676e73509f9e910f1d5a01e79b575bc'
+license=(
+  BSD
+  custom:PATENTS
+)
+depends=(
+  gcc-libs
+)
+makedepends=(
+  cmake
+  doxygen
+  ninja
+  yasm
+)
+source=(
+  https://storage.googleapis.com/aom-releases/libaom-$pkgver.tar.gz{,.asc}
+)
+b2sums=('c47b748e3dc43e39ecb55c4d61ea3d2d4a889bb8c6c399e29e14269757d271cd759a553f5da765bcdf7cd19546b408fce060d5ed3fb13e3aba4f8d22d612bf29'
         'SKIP')
-validpgpkeys=(B002F08B74A148DAA01F7123A48E86DB0B830498) # AOMedia release signing key <av1-discuss@aomedia.org>
+validpgpkeys=(
+  B002F08B74A148DAA01F7123A48E86DB0B830498 # AOMedia release signing key <av1-discuss@aomedia.org>
+)
 
 prepare() {
   cd libaom-$pkgver
 }
 
 build() {
+  [[ $CARCH != "aarch64" ]] && CONFIG="-DAOM_TARGET_CPU=generic"
+  local cmake_options=(
+    -DCMAKE_INSTALL_PREFIX=/usr
+    -DCMAKE_BUILD_TYPE=None
+    -DBUILD_SHARED_LIBS=1
+    -DENABLE_TESTS=0
+    $CONFIG
+  )
+
   # Upstream would like -O3
   CFLAGS="${CFLAGS/-O2/-O3}"
   CXXFLAGS="${CXXFLAGS/-O2/-O3}"
 
-  [[ $CARCH != "aarch64" ]] && CONFIG="-DAOM_TARGET_CPU=generic"
-  cmake -S libaom-$pkgver -B build -G Ninja \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=None \
-    -DBUILD_SHARED_LIBS=1 \
-    -DENABLE_TESTS=0 $CONFIG
+  cmake -S libaom-$pkgver -B build -G Ninja "${cmake_options[@]}"
   cmake --build build
 }