diff --git a/.gitignore b/.gitignore
index 8c0767f..51cab36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,3 +73,4 @@
 /gst-plugins-bad-free-1.18.0.tar.xz
 /gst-plugins-bad-free-1.18.1.tar.xz
 /gst-plugins-bad-free-1.18.2.tar.xz
+/gst-plugins-bad-free-1.18.4.tar.xz
diff --git a/gstreamer1-plugins-bad-free.spec b/gstreamer1-plugins-bad-free.spec
index b6b2ec4..e69f2f5 100644
--- a/gstreamer1-plugins-bad-free.spec
+++ b/gstreamer1-plugins-bad-free.spec
@@ -13,8 +13,8 @@
 #global shortcommit %(c=%{gitcommit}; echo ${c:0:5})
 
 Name:           gstreamer1-plugins-bad-free
-Version:        1.18.2
-Release:        7%{?gitcommit:.git%{shortcommit}}%{?dist}
+Version:        1.18.4
+Release:        1%{?gitcommit:.git%{shortcommit}}%{?dist}
 Summary:        GStreamer streaming media framework "bad" plugins
 
 License:        LGPLv2+ and LGPLv2
@@ -54,7 +54,6 @@ BuildRequires:  fdk-aac-free-devel
 %endif
 BuildRequires:  gsm-devel
 BuildRequires:  jasper-devel
-BuildRequires:  ladspa-devel
 BuildRequires:  lcms2-devel
 BuildRequires:  libdvdnav-devel
 BuildRequires:  libexif-devel
@@ -84,19 +83,20 @@ BuildRequires:  mesa-libEGL-devel
 BuildRequires:  vulkan-devel
 #BuildRequires:  mesa-vulkan-devel
 BuildRequires:  webrtc-audio-processing-devel
-BuildRequires:  libmicrodns-devel
-BuildRequires:  libopenmpt-devel
-BuildRequires:  srt-devel
 %if 0
 BuildRequires:  wpewebkit-devel
 BuildRequires:  wpebackend-fdo-devel
 %endif
 BuildRequires:  glslc
 BuildRequires:  libdrm-devel
-BuildRequires:  liblrdf-devel
-BuildRequires:  zvbi-devel
 
 %if %{with extras}
+BuildRequires:  ladspa-devel
+BuildRequires:  libmicrodns-devel
+BuildRequires:  liblrdf-devel
+BuildRequires:  srt-devel
+BuildRequires:  zvbi-devel
+BuildRequires:  libopenmpt-devel
 BuildRequires:  libaom-devel
 BuildRequires:  libbs2b-devel >= 3.1.0
 ## Plugins not ported
@@ -254,6 +254,9 @@ aren't tested well enough, or the code is not of good enough quality.
     %{!?with_extras:-D wildmidi=disabled -D zbar=disabled } \
     %{!?with_extras:-D gme=disabled -D lv2=disabled } \
     %{!?with_extras:-D webrtc=disabled -D aom=disabled } \
+    %{!?with_extras:-D teletext=disabled -D srt=disabled } \
+    %{!?with_extras:-D openmpt=disabled -D microdns=disabled } \
+    %{!?with_extras:-D ladspa=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 \
@@ -475,15 +478,11 @@ rm $RPM_BUILD_ROOT%{_bindir}/playout
 %{_libdir}/gstreamer-%{majorminor}/libgsthls.so
 %{_libdir}/gstreamer-%{majorminor}/libgstgsm.so
 %{_libdir}/gstreamer-%{majorminor}/libgstkms.so
-%{_libdir}/gstreamer-%{majorminor}/libgstladspa.so
-%{_libdir}/gstreamer-%{majorminor}/libgstmicrodns.so
 %{_libdir}/gstreamer-%{majorminor}/libgstnvcodec.so
-%{_libdir}/gstreamer-%{majorminor}/libgstopenmpt.so
 %{_libdir}/gstreamer-%{majorminor}/libgstopusparse.so
 %{_libdir}/gstreamer-%{majorminor}/libgstrist.so
 %{_libdir}/gstreamer-%{majorminor}/libgstsndfile.so
 %{_libdir}/gstreamer-%{majorminor}/libgstsoundtouch.so
-%{_libdir}/gstreamer-%{majorminor}/libgstsrt.so
 %{_libdir}/gstreamer-%{majorminor}/libgstsrtp.so
 %{_libdir}/gstreamer-%{majorminor}/libgstvulkan.so
 %if 0%{?fedora} || 0%{?rhel} > 7
@@ -499,9 +498,6 @@ rm $RPM_BUILD_ROOT%{_bindir}/playout
 %{_libdir}/gstreamer-%{majorminor}/libgstlv2.so
 %{_libdir}/gstreamer-%{majorminor}/libgstttmlsubs.so
 %endif
-%if !%{with extras}
-%exclude %{_libdir}/gstreamer-%{majorminor}/libgstteletext.so
-%endif
 
 #debugging plugin
 %{_libdir}/gstreamer-%{majorminor}/libgstdebugutilsbad.so
@@ -518,13 +514,17 @@ rm $RPM_BUILD_ROOT%{_bindir}/playout
 %{_libdir}/gstreamer-%{majorminor}/libgstdecklink.so
 %{_libdir}/gstreamer-%{majorminor}/libgstgme.so
 %{_libdir}/gstreamer-%{majorminor}/libgstkate.so
+%{_libdir}/gstreamer-%{majorminor}/libgstladspa.so
+%{_libdir}/gstreamer-%{majorminor}/libgstmicrodns.so
 %{_libdir}/gstreamer-%{majorminor}/libgstmodplug.so
 %{_libdir}/gstreamer-%{majorminor}/libgstofa.so
 %{_libdir}/gstreamer-%{majorminor}/libgstopenal.so
 #{_libdir}/gstreamer-%{majorminor}/libgstopencv.so
 %{_libdir}/gstreamer-%{majorminor}/libgstopenexr.so
 %{_libdir}/gstreamer-%{majorminor}/libgstopenjpeg.so
+%{_libdir}/gstreamer-%{majorminor}/libgstopenmpt.so
 %{_libdir}/gstreamer-%{majorminor}/libgstspandsp.so
+%{_libdir}/gstreamer-%{majorminor}/libgstsrt.so
 %{_libdir}/gstreamer-%{majorminor}/libgstteletext.so
 %{_libdir}/gstreamer-%{majorminor}/libgstva.so
 
@@ -608,6 +608,15 @@ rm $RPM_BUILD_ROOT%{_bindir}/playout
 
 
 %changelog
+* Tue Mar 16 2021 Wim Taymans <wtaymans@redhat.com> - 1.18.4-1
+- Update to 1.18.4
+
+* Tue Mar 09 2021 Wim Taymans <wtaymans@redhat.com> - 1.18.2-9
+- Fix typo when disabling microdns
+
+* Thu Feb 25 2021 Wim Taymans <wtaymans@redhat.com> - 1.18.2-8
+- Move ladspa, microdns, openmpt, srt and zvbi to extras
+
 * Mon Feb 08 2021 Wim Taymans <wtaymans@redhat.com> - 1.18.2-7
 - Rebuild for updated libmicrodns
 
diff --git a/sources b/sources
index 82233c9..ac7d9fd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gst-plugins-bad-free-1.18.2.tar.xz) = bb4967adb3e0fab40826d12d0e5951ef4707683d03cffd469970f68466800955936bb2f7c8ab7aa9b9d37935ba044e41f57f0f4d26bc21e0f75f5504c466d46d
+SHA512 (gst-plugins-bad-free-1.18.4.tar.xz) = 2161a673ec830844d2cd1162f373417b5c2216f8fbd2954bce825257aff7ae184f7e1e787a1cd3e9316d7ea43f16c4c70cfccc3a84368b239f4c2a2295a7bacf