diff --git a/audacity.changes b/audacity.changes
index 4841b7e..99acdf4 100644
--- a/audacity.changes
+++ b/audacity.changes
@@ -1,7 +1,12 @@
+-------------------------------------------------------------------
+Fri Aug 25 15:16:21 UTC 2017 - davejplater@gmail.com
+
+- Restore conditionals for lame, mad and twolame.
+
 -------------------------------------------------------------------
 Fri Aug 25 06:19:49 UTC 2017 - olaf@aepfle.de
 
-- Remove conditionals for ffmpeg, lame, mad, twolame
+- Remove conditionals for ffmpeg, lame, mad, twolame.
 
 -------------------------------------------------------------------
 Tue Jun  6 17:34:10 UTC 2017 - olaf@aepfle.de
diff --git a/audacity.spec b/audacity.spec
index 3a03417..f2c3949 100644
--- a/audacity.spec
+++ b/audacity.spec
@@ -16,6 +16,12 @@
 #
 
 
+%if 0%{?suse_version} < 1330
+%bcond_with mad
+%else
+%bcond_without mad
+%endif
+
 Name:           audacity
 Version:        2.1.3
 Release:        0
@@ -39,11 +45,12 @@ BuildRequires:  cmake
 BuildRequires:  desktop-file-utils
 #Audacity only builds with gcc >= 4.9
 # WARNING: Anything built against wxWidgets with gcc >= 5 needs widgets built with relax-abi.diff
-%if 0%{?suse_version} > 1320
-BuildRequires:  gcc-c++
+%if 0%{?suse_version} < 1330
+BuildRequires:  cpp5
+BuildRequires:  gcc5
+BuildRequires:  gcc5-c++
 %else
-# Leap 42.2+ / SLE12SP2Backports
-BuildRequires:  gcc6-c++
+BuildRequires:  gcc-c++
 %endif
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  wxWidgets-3_0-nostl-devel
@@ -69,18 +76,19 @@ BuildRequires:  pkgconfig(vamp-hostsdk)
 BuildRequires:  pkgconfig(vorbis)
 BuildRequires:  pkgconfig(vorbisenc)
 BuildRequires:  pkgconfig(vorbisfile)
-# This would require to patch our portaudio package with "PortMixer"... an extra API that never got integrated in PortAudio.
-#BuildRequires:  portaudio-devel
-Recommends:     %{name}-lang
-Recommends:     libavcodec
-Recommends:     libavformat
-Recommends:     libavutil
-Recommends:     libmp3lame0
-Requires:       libFLAC++6 >= 1.3.1
-Requires:       libFLAC8 >= 1.3.1
+%if %{with mad}
 BuildRequires:  libmp3lame-devel
 BuildRequires:  pkgconfig(mad)
 BuildRequires:  pkgconfig(twolame)
+%endif
+# This would require to patch our portaudio package with "PortMixer"... an extra API that never got integrated in PortAudio.
+#BuildRequires:  portaudio-devel
+Recommends:     %{name}-lang
+# WARNING Nothing provides libavutil without a suffix
+Requires:       ffmpeg
+Recommends:     libmp3lame0
+Requires:       libFLAC++6 >= 1.3.1
+Requires:       libFLAC8 >= 1.3.1
 
 %description
 Audacity is a program that manipulates digital audio wave forms. In
@@ -100,15 +108,13 @@ than the physical memory size of your computer.
 cp -f %{SOURCE1} LICENSE_NYQUIST.txt
 # Make sure we use the system versions.
 rm -rf lib-src/{expat,libvamp,libsoxr,ffmpeg}/
-rm -rf lib-src/lame/
+%if %{with mad}
+rm -rf lib-src/lame
+%endif
 
 %build
 test -x "$(type -p gcc-5)" && export CC=gcc-5
 test -x "$(type -p g++-5)" && export CXX=g++-5
-test -x "$(type -p gcc-6)" && export CC=gcc-6
-test -x "$(type -p g++-6)" && export CXX=g++-6
-test -x "$(type -p gcc-7)" && export CC=gcc-7
-test -x "$(type -p g++-7)" && export CXX=g++-7
 export CFLAGS="%{optflags} -fno-strict-aliasing"
 export CXXFLAGS="$CFLAGS -std=gnu++11"
 aclocal -I m4
@@ -118,6 +124,14 @@ autoconf
   --disable-sse                \
 %endif
   --with-ffmpeg=system \
+%if %{with mad}
+  --with-libmad=system \
+  --with-libtwolame=system \
+  --with-lame=system \
+%else
+  --without-libmad \
+  --without-libtwolame \
+%endif
   --docdir=%{_docdir}/%{name}/
 
 make %{?_smp_mflags}