diff --git a/.gitignore b/.gitignore
index 3727cb1..662daef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,9 +2,6 @@
 /aom-d0076f5.tar.gz
 /aom-cfd59e9.tar.gz
 /aom-9666276.tar.gz
-/aom-bb35ba9.tar.gz
-/aom-b52ee6d.tar.gz
-/aom-c0f1414.tar.gz
 /aom-7fadc0e.tar.gz
 /aom-ae2be80.tar.gz
 /aom-287164d.tar.gz
@@ -14,12 +11,3 @@
 /aom-3.5.0.tar.gz
 /aom-3.6.0.tar.gz
 /aom-3.6.1.tar.gz
-/aom-3.7.0.tar.gz
-/aom-3.7.1.tar.gz
-/aom-3.8.0.tar.gz
-/aom-3.8.2.tar.gz
-/aom-3.9.0.tar.gz
-/aom-3.11.0.tar.gz
-/aom-3.12.0.tar.gz
-/aom-3.13.0.tar.gz
-/aom-3.13.1.tar.gz
diff --git a/0001-cmake-fix-nasm-detection-w-3.0.patch b/0001-cmake-fix-nasm-detection-w-3.0.patch
deleted file mode 100644
index eef863c..0000000
--- a/0001-cmake-fix-nasm-detection-w-3.0.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 6d2b7f71b98bfa28e372b1f2d85f137280bdb3de Mon Sep 17 00:00:00 2001
-From: James Zern <jzern@google.com>
-Date: Tue, 7 Oct 2025 14:08:44 -0700
-Subject: [PATCH] cmake: fix nasm detection w/3.0
-
-nasm 3.0 separated Oflags (-Ox) output to `-hO` which is used to
-validate the nasm binary. This change is compatible with older versions
-(tested with NASM version 2.16.03 & 2.13.02).
-
-Bug: aomedia:448994065
-Fixed: aomedia:448994065
-Change-Id: I704dcfe39ac6e68bc4d5b9e409fb59a0d277170e
----
- build/cmake/aom_optimization.cmake | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/build/cmake/aom_optimization.cmake b/build/cmake/aom_optimization.cmake
-index 9cc34de362..2750a0be41 100644
---- a/build/cmake/aom_optimization.cmake
-+++ b/build/cmake/aom_optimization.cmake
-@@ -212,7 +212,7 @@ endfunction()
- # Currently checks only for presence of required object formats and support for
- # the -Ox argument (multipass optimization).
- function(test_nasm)
--  execute_process(COMMAND ${CMAKE_ASM_NASM_COMPILER} -hf
-+  execute_process(COMMAND ${CMAKE_ASM_NASM_COMPILER} -hO
-                   OUTPUT_VARIABLE nasm_helptext)
- 
-   if(NOT "${nasm_helptext}" MATCHES "-Ox")
-@@ -220,6 +220,8 @@ function(test_nasm)
-       FATAL_ERROR "Unsupported nasm: multipass optimization not supported.")
-   endif()
- 
-+  execute_process(COMMAND ${CMAKE_ASM_NASM_COMPILER} -hf
-+                  OUTPUT_VARIABLE nasm_helptext)
-   if("${AOM_TARGET_CPU}" STREQUAL "x86")
-     if("${AOM_TARGET_SYSTEM}" STREQUAL "Darwin")
-       if(NOT "${nasm_helptext}" MATCHES "macho32")
--- 
-2.51.0
-
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..85cab1a
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+# aom
+
+The aom package
\ No newline at end of file
diff --git a/aom-nostatic.patch b/aom-nostatic.patch
deleted file mode 100644
index 1755b03..0000000
--- a/aom-nostatic.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -up aom-3.13.1/build/cmake/aom_install.cmake.orig aom-3.13.1/build/cmake/aom_install.cmake
---- aom-3.13.1/build/cmake/aom_install.cmake.orig	2025-09-07 16:11:27.789000000 +0200
-+++ aom-3.13.1/build/cmake/aom_install.cmake	2025-12-30 21:08:54.594005985 +0100
-@@ -79,7 +79,7 @@ macro(setup_aom_install_targets)
-     endif()
- 
-     if(BUILD_SHARED_LIBS)
--      set(AOM_INSTALL_LIBS aom aom_static)
-+      set(AOM_INSTALL_LIBS aom)
-     else()
-       set(AOM_INSTALL_LIBS aom)
-     endif()
-diff -up aom-3.13.1/build/cmake/config.cmake.in.orig aom-3.13.1/build/cmake/config.cmake.in
---- aom-3.13.1/build/cmake/config.cmake.in.orig	2025-09-07 16:11:27.791000000 +0200
-+++ aom-3.13.1/build/cmake/config.cmake.in	2026-01-05 15:35:24.588489147 +0100
-@@ -10,13 +10,6 @@ include("${CMAKE_CURRENT_LIST_DIR}/@AOM_
- 
- set_and_check(@PROJECT_NAME@_INCLUDE_DIRS "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
- 
--# @PROJECT_NAME@::aom_static is defined only if BUILD_SHARED_LIBS=1 when libaom
--# was configured. When it is false, @PROJECT_NAME@::aom is a static library.
--if(TARGET @PROJECT_NAME@::aom_static)
--  set(@PROJECT_NAME@_STATIC_LIBRARIES "@PROJECT_NAME@::aom_static")
--else()
--  set(@PROJECT_NAME@_STATIC_LIBRARIES "@PROJECT_NAME@::aom")
--endif()
- set(@PROJECT_NAME@_LIBRARIES "@PROJECT_NAME@::aom")
- 
- check_required_components(@PROJECT_NAME@)
diff --git a/aom.spec b/aom.spec
index 75544c6..106b0e0 100644
--- a/aom.spec
+++ b/aom.spec
@@ -1,40 +1,40 @@
+%undefine __cmake_in_source_build
+
 %global sover           3
-%global aom_version     v3.13.1
+# git describe
+%global aom_version     v3.6.1
+
+# Use commit with updated changelog for correct versioning
+%global commit          fc430c57c7b0307b4c5ffb686cd90b3c010d08d2
+%global shortcommit     %(c=%{commit}; echo ${c:0:7})
+%global snapshotdate    20220619
 
 %if 0%{?fedora} || 0%{?rhel} >= 9
 %ifarch x86_64
 %bcond_without vmaf
 %endif
-%if 0%{?fedora} > 40 || 0%{?rhel} > 9
-%bcond_with jpegxl
-%else
 %bcond_without jpegxl
 %endif
-%endif
 
 Name:       aom
-Version:    3.13.1
+Version:    3.6.1
 Release:    %autorelease
 Summary:    Royalty-free next-generation video format
 
 License:    BSD-3-Clause
 URL:        http://aomedia.org/
-Source:     https://aomedia.googlesource.com/%{name}/+archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-# https://aomedia.issues.chromium.org/issues/448994065
-Patch:      0001-cmake-fix-nasm-detection-w-3.0.patch
-# Building static library breaks .cmake files if we don't ship it, so drop it
-Patch:      aom-nostatic.patch
+Source0:    https://aomedia.googlesource.com/%{name}/+archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
 BuildRequires:  gcc-c++
 BuildRequires:  gcc
-BuildRequires:  cmake3
+BuildRequires:  cmake
 BuildRequires:  doxygen
 BuildRequires:  git-core
 # BuildRequires:  graphviz
 BuildRequires:  perl-interpreter
 BuildRequires:  perl(Getopt::Long)
 BuildRequires:  python3-devel
-BuildRequires:  nasm
+BuildRequires:  yasm
 %if %{with jpegxl}
 BuildRequires:  pkgconfig(libjxl)
 BuildRequires:  pkgconfig(libhwy)
@@ -69,22 +69,12 @@ video format.
 
 %package -n libaom-devel
 Summary:        Development files for aom
-# cmake files assume /usr/bin/aomdec is present
-Requires:       aom%{?_isa} = %{version}-%{release}
 Requires:       libaom%{?_isa} = %{version}-%{release}
 
 %description -n libaom-devel
 Development files for aom, the royalty-free next-generation
 video format.
 
-%package -n libaom-devel-docs
-Summary:        Documentation for libaom
-Requires:       libaom-devel%{?_isa} = %{version}-%{release}
-
-%description -n libaom-devel-docs
-Documentation for libaom, the royalty-free next-generation
-video format.
-
 %prep
 %autosetup -p1 -c %{name}-%{version}
 # Set GIT revision in version
@@ -93,6 +83,10 @@ sed -i 's@set(aom_version "")@set(aom_version "%{aom_version}")@' build/cmake/ve
 sed -i "s@GENERATE_LATEX         = YES@GENERATE_LATEX         = NO@" libs.doxy_template
 
 %build
+%ifarch %{arm}
+%global optflags %{__global_compiler_flags} -march=armv7-a -mfpu=neon -mtune=cortex-a8 -mabi=aapcs-linux -mfloat-abi=hard
+%endif
+
 %cmake3 -DENABLE_CCACHE=1 \
         -DCMAKE_SKIP_RPATH=1 \
         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
@@ -112,6 +106,7 @@ sed -i "s@GENERATE_LATEX         = YES@GENERATE_LATEX         = NO@" libs.doxy_t
 
 %install
 %cmake3_install
+rm -rvf %{buildroot}%{_libdir}/libaom.a
 
 %files
 %doc AUTHORS CHANGELOG README.md
@@ -124,13 +119,10 @@ sed -i "s@GENERATE_LATEX         = YES@GENERATE_LATEX         = NO@" libs.doxy_t
 %{_libdir}/libaom.so.%{sover}*
 
 %files -n libaom-devel
+%doc %{_vpath_builddir}/docs/html/
 %{_includedir}/%{name}
 %{_libdir}/libaom.so
-%{_libdir}/cmake/AOM/
 %{_libdir}/pkgconfig/%{name}.pc
 
-%files -n libaom-devel-docs
-%doc %{_vpath_builddir}/docs/html/
-
 %changelog
 %autochangelog
diff --git a/sources b/sources
index 85f4d55..7fe82bc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (aom-3.13.1.tar.gz) = 20cdde0fc4304ba0056e4dac55838587a3671112ec74274f8dcb1588549a524ed9a8e702d1f068c46833dfb93f565eb5a03ab610b0222a6f137d3cd8a8866de7
+SHA512 (aom-3.6.1.tar.gz) = e69e3734452be56857cc903000ca7d7c4bfd1110030fb58902ebda127ba04024fd60b209a2323d0945c0c4335c2dbb61a2d7dc57c7b6c6ec44280b2f215699bf