diff --git a/gstreamer-plugins-bad-free.spec b/gstreamer-plugins-bad-free.spec
index efda596..01cdc69 100644
--- a/gstreamer-plugins-bad-free.spec
+++ b/gstreamer-plugins-bad-free.spec
@@ -4,6 +4,8 @@
 %define gst_minver   0.10.36
 %define gstpb_minver %{gst_minver}
 
+%bcond_without extras
+
 Summary: GStreamer streaming media framework "bad" plug-ins
 Name: gstreamer-plugins-bad-free
 Version: 0.10.23
@@ -48,7 +50,7 @@ BuildRequires: openssl-devel
 BuildRequires: orc-devel
 Buildrequires: wavpack-devel
 
-# Need for extras package
+%if %{with extras}
 BuildRequires: celt-devel
 BuildRequires: dirac-devel
 BuildRequires: gmyth-devel >= 0.4
@@ -69,6 +71,7 @@ BuildRequires: slv2-devel
 BuildRequires: soundtouch-devel
 BuildRequires: wildmidi-devel
 BuildRequires: zbar-devel
+%endif
 
 Obsoletes: gstreamer-plugins-flumpegdemux < 0.10.15-9
 Provides: gstreamer-plugins-flumpegdemux = %{version}-%{release}
@@ -86,6 +89,7 @@ This package contains plug-ins that aren't tested
 well enough, or the code is not of good enough quality.
 
 
+%if %{with extras}
 %package extras
 Summary: Extra GStreamer "bad" plugins (less often used "bad" plugins)
 Group: Applications/Multimedia
@@ -103,7 +107,7 @@ tested well enough, or the code is not of good enough quality.
 This package (gstreamer-plugins-bad-extras) contains extra "bad" plugins for
 sources (mythtv), sinks (fbdev) and effects (pitch) which are not used
 very much and require additional libraries to be installed.
-
+%endif
 
 %package devel
 Summary: Development files for the GStreamer media framework "bad" plug-ins
@@ -144,6 +148,7 @@ sed -i 's/opencv <= 2.2.0/opencv <= 2.4.0/g' configure
 %configure \
     --with-package-name="Fedora gstreamer-plugins-bad package" \
     --with-package-origin="http://download.fedora.redhat.com/fedora" \
+    %{!?with_extras:--disable-fbdev --disable-decklink --disable-linsys} \
     --enable-debug --disable-static --enable-gtk-doc --enable-experimental \
     --disable-divx
 
@@ -177,7 +182,9 @@ sed -i 's/opencv <= 2.2.0/opencv <= 2.4.0/g' configure
 %{_libdir}/libgstcodecparsers-%{majorminor}.so.*
 %{_libdir}/libgstphotography-%{majorminor}.so.*
 %{_libdir}/libgstsignalprocessor-%{majorminor}.so.*
+%if %{with extras}
 %{_libdir}/libgstvdp-%{majorminor}.so.*
+%endif
 # Plugins without external dependencies
 %{_libdir}/gstreamer-%{majorminor}/libgstadpcmdec.so
 %{_libdir}/gstreamer-%{majorminor}/libgstadpcmenc.so
@@ -273,6 +280,7 @@ sed -i 's/opencv <= 2.2.0/opencv <= 2.4.0/g' configure
 #data for plugins
 %{_datadir}/glib-2.0/schemas/org.freedesktop.gstreamer-%{majorminor}.default-elements.gschema.xml
 
+%if %{with extras}
 %files extras
 %defattr(-,root,root,-)
 # Plugins with external dependencies
@@ -300,6 +308,7 @@ sed -i 's/opencv <= 2.2.0/opencv <= 2.4.0/g' configure
 %{_libdir}/gstreamer-%{majorminor}/libgstdecklink.so
 %{_libdir}/gstreamer-%{majorminor}/libgstfbdevsink.so
 %{_libdir}/gstreamer-%{majorminor}/libgstlinsys.so
+%endif
 
 %files devel
 %defattr(-,root,root,-)
@@ -308,13 +317,17 @@ sed -i 's/opencv <= 2.2.0/opencv <= 2.4.0/g' configure
 %{_libdir}/libgstcodecparsers-%{majorminor}.so
 %{_libdir}/libgstphotography-%{majorminor}.so
 %{_libdir}/libgstsignalprocessor-%{majorminor}.so
+%if %{with extras}
 %{_libdir}/libgstvdp-%{majorminor}.so
+%endif
 %{_includedir}/gstreamer-%{majorminor}/gst/basecamerabinsrc
 %{_includedir}/gstreamer-%{majorminor}/gst/codecparsers
 %{_includedir}/gstreamer-%{majorminor}/gst/interfaces/photography*
 %{_includedir}/gstreamer-%{majorminor}/gst/signalprocessor
 %{_includedir}/gstreamer-%{majorminor}/gst/video
+%if %{with extras}
 %{_includedir}/gstreamer-%{majorminor}/gst/vdpau
+%endif
 
 # pkg-config files
 %{_libdir}/pkgconfig/gstreamer-basevideo-%{majorminor}.pc