diff --git a/gstreamer1-plugins-bad-free.spec b/gstreamer1-plugins-bad-free.spec
index 1f89895..4d8b0b3 100644
--- a/gstreamer1-plugins-bad-free.spec
+++ b/gstreamer1-plugins-bad-free.spec
@@ -14,7 +14,7 @@
 
 Name:           gstreamer1-plugins-bad-free
 Version:        1.18.2
-Release:        5%{?gitcommit:.git%{shortcommit}}%{?dist}
+Release:        6%{?gitcommit:.git%{shortcommit}}%{?dist}
 Summary:        GStreamer streaming media framework "bad" plugins
 
 License:        LGPLv2+ and LGPLv2
@@ -58,7 +58,6 @@ BuildRequires:  ladspa-devel
 BuildRequires:  lcms2-devel
 BuildRequires:  libdvdnav-devel
 BuildRequires:  libexif-devel
-BuildRequires:  libmpcdec-devel
 BuildRequires:  librsvg2-devel
 BuildRequires:  libsndfile-devel
 BuildRequires:  mesa-libGL-devel
@@ -85,7 +84,6 @@ BuildRequires:  mesa-libEGL-devel
 BuildRequires:  vulkan-devel
 #BuildRequires:  mesa-vulkan-devel
 BuildRequires:  webrtc-audio-processing-devel
-BuildRequires:  libaom-devel
 BuildRequires:  libmicrodns-devel
 BuildRequires:  libopenmpt-devel
 BuildRequires:  srt-devel
@@ -99,6 +97,7 @@ BuildRequires:  liblrdf-devel
 BuildRequires:  zvbi-devel
 
 %if %{with extras}
+BuildRequires:  libaom-devel
 BuildRequires:  libbs2b-devel >= 3.1.0
 ## Plugins not ported
 #BuildRequires:  dirac-devel
@@ -254,7 +253,7 @@ aren't tested well enough, or the code is not of good enough quality.
     %{!?with_extras:-D opencv=disabled -D openjpeg=disabled } \
     %{!?with_extras:-D wildmidi=disabled -D zbar=disabled } \
     %{!?with_extras:-D gme=disabled -D lv2=disabled } \
-    %{!?with_extras:-D webrtc=disabled } \
+    %{!?with_extras:-D webrtc=disabled -D aom=disabled } \
     -D doc=disabled -D magicleap=disabled -D msdk=disabled \
     -D dts=disabled -D faac=disabled -D faad=disabled \
     -D libmms=disabled -D mpeg2enc=disabled -D mplex=disabled \
@@ -468,7 +467,6 @@ rm $RPM_BUILD_ROOT%{_bindir}/playout
 
 # Plugins with external dependencies
 
-%{_libdir}/gstreamer-%{majorminor}/libgstaom.so
 %{_libdir}/gstreamer-%{majorminor}/libgstbluez.so
 %{_libdir}/gstreamer-%{majorminor}/libgstbz2.so
 %{_libdir}/gstreamer-%{majorminor}/libgstclosedcaption.so
@@ -512,6 +510,7 @@ rm $RPM_BUILD_ROOT%{_bindir}/playout
 %if %{with extras}
 %files extras
 # Plugins with external dependencies
+%{_libdir}/gstreamer-%{majorminor}/libgstaom.so
 %{_libdir}/gstreamer-%{majorminor}/libgstassrender.so
 %{_libdir}/gstreamer-%{majorminor}/libgstbs2b.so
 %{_libdir}/gstreamer-%{majorminor}/libgstchromaprint.so
@@ -609,6 +608,10 @@ rm $RPM_BUILD_ROOT%{_bindir}/playout
 
 
 %changelog
+* Wed Jan 20 2021 Wim Taymans <wtaymans@redhat.com> - 1.18.2-6
+- Move libaom to extras
+- Remove unused musepack buildreq
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild