diff --git a/audacity-flac_assert.h.patch b/audacity-flacversion.patch
similarity index 73%
rename from audacity-flac_assert.h.patch
rename to audacity-flacversion.patch
index 3fbbe74..da05ce7 100644
--- a/audacity-flac_assert.h.patch
+++ b/audacity-flacversion.patch
@@ -1,22 +1,24 @@
---- a/m4/audacity_checklib_libflac.m4
-+++ b/m4/audacity_checklib_libflac.m4
+Index: m4/audacity_checklib_libflac.m4
+===================================================================
+--- m4/audacity_checklib_libflac.m4.orig	2017-03-13 23:02:21.000000000 +0200
++++ m4/audacity_checklib_libflac.m4	2017-03-18 18:39:01.009659215 +0200
 @@ -13,21 +13,21 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBFLAC], [
  
     dnl See if FLAC is installed in the system
  
 -   PKG_CHECK_MODULES([FLAC], [flac >= 1.3.0 flac++ >= 1.3.0],
-+   PKG_CHECK_MODULES([FLAC], [flac >= 1.5.0 flac++ >= 1.5.0],
++   PKG_CHECK_MODULES([FLAC], [flac >= 1.3.1 flac++ >= 1.3.1],
                       [LIBFLAC_SYSTEM_AVAILABLE="yes"],
                       [LIBFLAC_SYSTEM_AVAILABLE="no"])
  
 -   dnl Check for flac < 1.3.0
-+   dnl Check for flac < 1.5.0
++   dnl Check for flac < 1.3.1
     if test "$LIBFLAC_SYSTEM_AVAILABLE" = "no"; then
        PKG_CHECK_MODULES([FLAC], [flac flac++],
                          [LIBFLAC_SYSTEM_AVAILABLE="yes"],
                          [LIBFLAC_SYSTEM_AVAILABLE="no"])
 -      dnl flac < 1.3.0 adds its own FLAC and FLAC++ subdirectories to the search
-+      dnl flac < 1.5.0 adds its own FLAC and FLAC++ subdirectories to the search
++      dnl flac < 1.3.1 adds its own FLAC and FLAC++ subdirectories to the search
        dnl path and ships a assert.h file there. This assert.h overwrites the
        dnl assert.h header from the C standard library. We need to strip /FLAC
        dnl and /FLAC++ from the include paths to make the assert.h from the C
diff --git a/audacity.changes b/audacity.changes
index 4bd707a..bbfa812 100644
--- a/audacity.changes
+++ b/audacity.changes
@@ -4,8 +4,11 @@ Sat Mar 18 13:53:54 UTC 2017 - davejplater@gmail.com
 - Update to release 2.1.3
 - Recreated audacity-no_buildstamp.patch with 2.1.3 release date
   and time.
+- Added audacity-flacversion.patch to fix minimum version in m4
+  macro.
 - Rebased audacity-fix-nonsense.patch
-- Deleted audacity-ffmpeg.patch and audacity-gcc6.patch
+- Deleted audacity-ffmpeg.patch, audacity-flac_assert.h.patch and
+  audacity-gcc6.patch
 - Upstream changes:
  * Interface:
    * Pinned option on waveform so waveform moves and
diff --git a/audacity.spec b/audacity.spec
index d035355..e324333 100644
--- a/audacity.spec
+++ b/audacity.spec
@@ -34,8 +34,8 @@ Source1:        %{name}-license-nyquist
 Source2:        %{name}-rpmlintrc
 # PATCH-FIX-OPENSUSE audacity-no_buildstamp.patch davejplater@gmail.com -- Remove the buildstamp.
 Patch0:         %{name}-no_buildstamp.patch
-# PATCH-FIX-OPENSUSE audacity-flac_assert.h.patch joerg.lorenzen@ki.tng.de -- Patch to fix build against libflac 1.3.0+.
-Patch1:         %{name}-flac_assert.h.patch
+# PATCH-FIX-OPENSUSE audacity-flacversion.patch davejplater@gmail.com -- Patch to fix build against libflac 1.3.1+.
+Patch1:         %{name}-flacversion.patch
 # PATCH-FIX-UPSTREAM audacity-fix-nonsense.patch sor.alexei@meowr.ru -- Remove things that break build for no reason.
 Patch2:         %{name}-fix-nonsense.patch
 BuildRequires:  autoconf
@@ -106,9 +106,9 @@ than the physical memory size of your computer.
 %prep
 %setup -q -n %{name}-Audacity-%{version}
 %patch0
-%patch1 -p1
+%patch1 -p0
 %patch2 -p0
-#%%patch5
+
 cp -f %{SOURCE1} LICENSE_NYQUIST.txt
 # Make sure we use the system versions.
 rm -rf lib-src/{expat,libvamp,libsoxr,ffmpeg}/