diff --git a/vlc.changes b/vlc.changes
index e35db44..acae3ae 100644
--- a/vlc.changes
+++ b/vlc.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Feb 14 20:12:18 UTC 2018 - bjorn.lie@gmail.com
+
+- Move liba52-devel, libmad-devel and pkgconfig(twolame)
+  BuildRequires from conditional BUILD_ORIG to standard build, now
+  available in openSUSE. Following this, remove --disable-a52 and
+  --disable-mad and move --enable-a52 and --enable-mad to normal
+  part of configure calls. Add a --enable-twolame configure call to
+  ensure we build twolame support.
+
 -------------------------------------------------------------------
 Mon Feb 12 10:52:18 UTC 2018 - dimstar@opensuse.org
 
diff --git a/vlc.spec b/vlc.spec
index 33e6837..6b4cf94 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -61,6 +61,7 @@ BuildRequires:  gettext-devel
 #BuildRequires:  git
 BuildRequires:  gtk3-devel
 BuildRequires:  libQt5Gui-private-headers-devel
+BuildRequires:  liba52-devel
 BuildRequires:  libavc1394-devel >= 0.5.3
 BuildRequires:  libcddb-devel >= 0.9.5
 BuildRequires:  libcdio-devel >= 0.78.2
@@ -71,6 +72,7 @@ BuildRequires:  libidn-devel
 BuildRequires:  libjack-devel >= 1.9.7
 BuildRequires:  libjpeg-devel
 BuildRequires:  libkate-devel >= 0.3.0
+BuildRequires:  libmad-devel
 BuildRequires:  libmatroska-devel
 BuildRequires:  libogg-devel >= 1.0
 BuildRequires:  libopus-devel >= 1.0.3
@@ -127,6 +129,7 @@ BuildRequires:  pkgconfig(libva-x11)
 BuildRequires:  pkgconfig(protobuf-lite) >= 2.5.0
 BuildRequires:  pkgconfig(speexdsp)
 BuildRequires:  pkgconfig(taglib) >= 1.9
+BuildRequires:  pkgconfig(twolame)
 BuildRequires:  pkgconfig(wayland-protocols)
 BuildRequires:  pkgconfig(xcb) >= 1.6
 BuildRequires:  pkgconfig(xcb-composite)
@@ -187,14 +190,11 @@ BuildRequires:  pkgconfig(ncursesw)
 # Those are dependencies which are NOT provided in openSUSE, mostly for legal reasons.
 %if 0%{?BUILD_ORIG}
 BuildRequires:  faad2-devel
-BuildRequires:  liba52-devel
 BuildRequires:  libfaac-devel
-BuildRequires:  libmad-devel
 BuildRequires:  libxvidcore-devel
 BuildRequires:  pkgconfig(libdca) >= 0.0.5
 BuildRequires:  pkgconfig(libmpeg2) > 0.3.2
 BuildRequires:  pkgconfig(libpostproc)
-BuildRequires:  pkgconfig(twolame)
 BuildRequires:  pkgconfig(vdpau) >= 0.6
 BuildRequires:  pkgconfig(x264) >= 0.8.6
 %endif
@@ -339,6 +339,7 @@ sed -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -i modules/gui/qt/dialogs/help.cpp src/
 %configure \
    --disable-dependency-tracking        \
    --enable-aa                          \
+   --enable-a52                         \
    --enable-alsa                        \
    --enable-dvbpsi                      \
    --enable-dvdnav                      \
@@ -352,6 +353,7 @@ sed -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -i modules/gui/qt/dialogs/help.cpp src/
    --enable-kate                        \
    --enable-libass                      \
    --enable-libcddb                     \
+   --enable-mad                         \
 %if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
    --enable-opencv                      \
 %endif
@@ -364,17 +366,13 @@ sed -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -i modules/gui/qt/dialogs/help.cpp src/
 %endif
 %if 0%{?BUILD_ORIG}
    --enable-libmpeg2                    \
-   --enable-mad                         \
    --enable-postproc                    \
    --enable-faad                        \
-   --enable-a52                         \
    --enable-dca                         \
 %else
    --disable-libmpeg2                   \
-   --disable-mad                        \
    --disable-postproc                   \
    --disable-faad                       \
-   --disable-a52                        \
    --disable-dca                        \
 %endif
    --enable-avcodec                     \
@@ -391,6 +389,7 @@ sed -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -i modules/gui/qt/dialogs/help.cpp src/
    --enable-speex                       \
    --enable-taglib                      \
    --enable-theora                      \
+   --enable-twolame                     \
    --enable-v4l2                        \
    --enable-vcd                         \
    --enable-vorbis                      \
@@ -723,6 +722,7 @@ done
 %{_libdir}/vlc/plugins/audio_filter/libgain_plugin.so
 %{_libdir}/vlc/plugins/audio_filter/libheadphone_channel_mixer_plugin.so
 %{_libdir}/vlc/plugins/audio_filter/libkaraoke_plugin.so
+%{_libdir}/vlc/plugins/audio_filter/libmad_plugin.so
 %{_libdir}/vlc/plugins/audio_filter/libmono_plugin.so
 %{_libdir}/vlc/plugins/audio_filter/libnormvol_plugin.so
 %{_libdir}/vlc/plugins/audio_filter/libparam_eq_plugin.so
@@ -743,6 +743,7 @@ done
 %{_libdir}/vlc/plugins/audio_output/libafile_plugin.so
 %{_libdir}/vlc/plugins/audio_output/libjack_plugin.so
 %{_libdir}/vlc/plugins/audio_output/libpulse_plugin.so
+%{_libdir}/vlc/plugins/codec/liba52_plugin.so
 %{_libdir}/vlc/plugins/codec/libadpcm_plugin.so
 %{_libdir}/vlc/plugins/codec/libaes3_plugin.so
 %{_libdir}/vlc/plugins/codec/libaraw_plugin.so
@@ -778,6 +779,7 @@ done
 %{_libdir}/vlc/plugins/codec/libt140_plugin.so
 %{_libdir}/vlc/plugins/codec/libtelx_plugin.so
 %{_libdir}/vlc/plugins/codec/libtheora_plugin.so
+%{_libdir}/vlc/plugins/codec/libtwolame_plugin.so
 %{_libdir}/vlc/plugins/codec/libuleaddvaudio_plugin.so
 %{_libdir}/vlc/plugins/codec/libvaapi_drm_plugin.so
 %{_libdir}/vlc/plugins/codec/libvorbis_plugin.so
@@ -998,10 +1000,7 @@ done
 %files codecs
 %{_libdir}/vlc/plugins/codec/libfaad_plugin.so
 %{_libdir}/vlc/plugins/codec/liblibmpeg2_plugin.so
-%{_libdir}/vlc/plugins/codec/libtwolame_plugin.so
 %{_libdir}/vlc/plugins/codec/libx264_plugin.so
-%{_libdir}/vlc/plugins/audio_filter/libmad_plugin.so
-%{_libdir}/vlc/plugins/codec/liba52_plugin.so
 %{_libdir}/vlc/plugins/codec/libdca_plugin.so
 
 %{_libdir}/vlc/libvlc_vdpau.so.0