diff --git a/.gitignore b/.gitignore
index aeb4c9f..3b2b0d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /aom-d0076f5.tar.gz
 /aom-cfd59e9.tar.gz
 /aom-9666276.tar.gz
+/aom-7fadc0e.tar.gz
diff --git a/aom.spec b/aom.spec
index 8ee975b..d219800 100644
--- a/aom.spec
+++ b/aom.spec
@@ -1,16 +1,25 @@
-%global sover           0
+%undefine __cmake_in_source_build
+
+%global sover           3
 # git describe
-%global aom_version     1.0.0-2227-gcfd59e96a
+%global aom_version     v3.1.1
 
 # Use commit with updated changelog for correct versioning
-%global commit          9666276accea505cd14cbcb9e3f7ff5033da9172
+%global commit          7fadc0e77130efb05f52979b0deaba9b6a1bba6d
 %global shortcommit     %(c=%{commit}; echo ${c:0:7})
-%global snapshotdate    20190810
-%global prerelease      1
+%global snapshotdate    20210613
+# %%global prerelease      1
+
+%if 0%{?fedora}
+%ifarch x86_64
+%bcond_without vmaf
+%endif
+%bcond_without jpegxl
+%endif
 
 Name:       aom
-Version:    1.0.0
-Release:    8.%{?prerelease:%{snapshotdate}git%{shortcommit}}%{?dist}
+Version:    3.1.1
+Release:    1%{?prerelease:.%{snapshotdate}git%{shortcommit}}%{?dist}
 Summary:    Royalty-free next-generation video format
 
 License:    BSD
@@ -19,15 +28,21 @@ Source0:    https://aomedia.googlesource.com/%{name}/+archive/%{commit}.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:  perl-interpreter
 BuildRequires:  python3-devel
 BuildRequires:  yasm
+%if %{with jpegxl}
+BuildRequires:  pkgconfig(libjxl)
+BuildRequires:  pkgconfig(libhwy)
+%endif
+%if %{with vmaf}
+BuildRequires:  pkgconfig(libvmaf)
+%endif
 
 Provides:       av1 = %{version}-%{release}
 Requires:       libaom%{?_isa} = %{version}-%{release}
@@ -63,26 +78,34 @@ video format.
 
 %prep
 %autosetup -p1 -c %{name}-%{commit}
-# Set GIT revision in version
+# Set GIT revision in version
 sed -i 's@set(aom_version "")@set(aom_version "%{aom_version}")@' build/cmake/version.cmake
 
 %build
-mkdir _build && cd _build
-%cmake3 ../ -DENABLE_CCACHE=1 \
-            -DCMAKE_SKIP_RPATH=1 \
-            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
 %ifarch %{arm}
-            -DAOM_NEON_INTRIN_FLAG=-mfpu=neon \
+%global optflags %{__global_compiler_flags} -march=armv7-a -mfpu=neon -mtune=cortex-a8 -mabi=aapcs-linux -mfloat-abi=hard
 %endif
-            -DCONFIG_WEBM_IO=1 \
-            -DENABLE_DOCS=1 \
-            -DCONFIG_ANALYZER=0 \
-            -DCONFIG_LOWBITDEPTH=1
-%make_build
+
+%cmake3 -DENABLE_CCACHE=1 \
+        -DCMAKE_SKIP_RPATH=1 \
+        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+        -DCONFIG_WEBM_IO=1 \
+        -DENABLE_DOCS=1 \
+        -DENABLE_TESTS=0 \
+        -DCONFIG_ANALYZER=0 \
+        -DBUILD_SHARED_LIBS=1 \
+%if %{with jpegxl}
+        -DCONFIG_TUNE_BUTTERAUGLI=1 \
+%endif
+%if %{with vmaf}
+        -DCONFIG_TUNE_VMAF=1 \
+%endif
+        %{nil}
+%cmake3_build
 
 %install
-cd _build
-%make_install
+%cmake3_install
+rm -rvf %{buildroot}%{_libdir}/libaom.a
 
 %files
 %doc AUTHORS CHANGELOG README.md
@@ -92,15 +115,25 @@ cd _build
 
 %files -n libaom
 %license LICENSE PATENTS
-%{_libdir}/libaom.so.%{sover}
+%{_libdir}/libaom.so.%{sover}*
 
 %files -n libaom-devel
-%doc _build/docs/html/
+%doc %{_vpath_builddir}/docs/html/
 %{_includedir}/%{name}
 %{_libdir}/libaom.so
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Sun Jun 13 12:47:37 CEST 2021 Robert-André Mauchin <zebob.m@gmail.com> - 3.1.1-1
+- Update to 3.1.1
+- Close: rhbz#1954337
+- Security fix for CVE-2021-30473
+- Fix: rhbz#1961375
+- Fix: rhbz#1961376
+- Security fix for CVE-2021-30475
+- Fix: rhbz#1968017
+- Fix: rhbz#1968018
+
 * Fri Aug 09 17:45:23 CEST 2019 Robert-André Mauchin <zebob.m@gmail.com> - 1.0.0-8.20190810git9666276
 - Update to commit 9666276accea505cd14cbcb9e3f7ff5033da9172
 
diff --git a/sources b/sources
index 3c810c7..5ca5d8a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (aom-9666276.tar.gz) = 2c979cd2d1229016e5a6336993144d7b5161fd2f2e8b3023177be3d954c2abade5bb17957e4aeeeedd6132fbaf5e2daf79f0cdddf3ad625213dc267761490d7c
+SHA512 (aom-7fadc0e.tar.gz) = 16c24e4b62fc3abb67b4f0f1e39bfb56d59a893a50fb3ab7b5689d0ca3ee745e6fe9bafa9672be0833186b46bd473b27997bb47a7ade73363bf28fd4c3c188b6