diff --git a/gstreamer1-plugins-good.spec b/gstreamer1-plugins-good.spec
index 9c758e8..b16ad68 100644
--- a/gstreamer1-plugins-good.spec
+++ b/gstreamer1-plugins-good.spec
@@ -17,7 +17,7 @@
 
 Name:           gstreamer1-plugins-good
 Version:        1.18.4
-Release:        2%{?gitcommit:.git%{shortcommit}}%{?dist}
+Release:        3%{?gitcommit:.git%{shortcommit}}%{?dist}
 Summary:        GStreamer plugins with good code and licensing
 
 License:        LGPLv2+
@@ -76,16 +76,15 @@ BuildRequires:  nasm
 %endif
 BuildRequires:  libgudev-devel
 
+# extras
+%if %{with extras}
+BuildRequires:  jack-audio-connection-kit-devel
 %ifnarch s390 s390x
 BuildRequires:  libavc1394-devel
 BuildRequires:  libdv-devel
 BuildRequires:  libiec61883-devel
 BuildRequires:  libraw1394-devel
 %endif
-
-# extras
-%if %{with extras}
-BuildRequires:  jack-audio-connection-kit-devel
 %endif
 
 # Obsoletes/Provides moved from plugins-bad-free
@@ -182,9 +181,11 @@ to be installed.
   -D jack=%{?with_extras:enabled}%{!?with_extras:disabled} \
 %ifarch s390 s390x
   -D dv=disabled -D dv1394=disabled \
+%else
+  -D dv=%{?with_extras:enabled}%{!?with_extras:disabled} \
+  -D dv1394=%{?with_extras:enabled}%{!?with_extras:disabled} \
 %endif
 
-
 %meson_build
 
 %install
@@ -279,10 +280,6 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';'
 %{_libdir}/gstreamer-%{majorminor}/libgstmpg123.so
 %{_libdir}/gstreamer-%{majorminor}/libgsttwolame.so
 
-%ifnarch s390 s390x
-%{_libdir}/gstreamer-%{majorminor}/libgstdv.so
-%{_libdir}/gstreamer-%{majorminor}/libgst1394.so
-%endif
 
 %files gtk
 # Plugins with external dependencies
@@ -295,10 +292,18 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';'
 %files extras
 # Plugins with external dependencies
 %{_libdir}/gstreamer-%{majorminor}/libgstjack.so
+%ifnarch s390 s390x
+%{_libdir}/gstreamer-%{majorminor}/libgstdv.so
+%{_libdir}/gstreamer-%{majorminor}/libgst1394.so
+%endif
 %endif
 
 
 %changelog
+* Fri May 14 2021 Wim Taymans <wtaymans@redhat.com> - 1.18.4-3
+- Move libdv and friends to extras
+- Resolves: rhbz#1960634
+
 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.18.4-2
 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937