diff --git a/extra/aom/.SRCINFO b/extra/aom/.SRCINFO
index 5cb2cac2c..30f4bc677 100644
--- a/extra/aom/.SRCINFO
+++ b/extra/aom/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = aom
 	pkgdesc = Alliance for Open Media video codec
 	pkgver = 3.8.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://aomedia.org/
 	arch = x86_64
 	license = BSD
diff --git a/extra/aom/PKGBUILD b/extra/aom/PKGBUILD
index 163e0cf75..8e645e3c5 100644
--- a/extra/aom/PKGBUILD
+++ b/extra/aom/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=(
   aom-docs
 )
 pkgver=3.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Alliance for Open Media video codec"
 url="https://aomedia.org/"
 arch=(x86_64)
@@ -43,17 +43,16 @@ prepare() {
 build() {
   [[ $CARCH != "aarch64" ]] && CONFIG="-DAOM_TARGET_CPU=generic"
   local cmake_options=(
+    # Upstream would like Release, adding -O3 and removing assertions
+    # https://gitlab.archlinux.org/archlinux/packaging/packages/aom/-/issues/1
+    -D CMAKE_BUILD_TYPE=Release
+
     -D CMAKE_INSTALL_PREFIX=/usr
-    -D CMAKE_BUILD_TYPE=None
     -D BUILD_SHARED_LIBS=1
     -D ENABLE_TESTS=0
     $CONFIG
   )
 
-  # Upstream would like -O3
-  CFLAGS="${CFLAGS/-O2/-O3}"
-  CXXFLAGS="${CXXFLAGS/-O2/-O3}"
-
   cmake -S libaom-$pkgver -B build -G Ninja "${cmake_options[@]}"
   cmake --build build
 }