diff --git a/libffado-gcc6.patch b/libffado-gcc6.patch
new file mode 100644
index 0000000..7e98992
--- /dev/null
+++ b/libffado-gcc6.patch
@@ -0,0 +1,19 @@
+diff -urp a/src/libutil/TimestampedBuffer.cpp b/src/libutil/TimestampedBuffer.cpp
+--- a/src/libutil/TimestampedBuffer.cpp	2014-06-01 19:00:10.000000000 -0500
++++ b/src/libutil/TimestampedBuffer.cpp	2016-02-29 21:01:56.693239943 -0600
+@@ -32,6 +32,7 @@
+ 
+ #include <cstdlib>
+ #include <cstring>
++#include <math.h>
+ 
+ #define DLL_PI        (3.141592653589793238)
+ #define DLL_SQRT2     (1.414213562373095049)
+@@ -179,7 +180,6 @@ bool TimestampedBuffer::setWrapValue(ffa
+     m_wrap_at=w;
+     return true;
+ }
+-#include <math.h>
+ 
+ /**
+  * \brief return the effective rate
diff --git a/libffado.spec b/libffado.spec
index 6855d67..33c9fff 100644
--- a/libffado.spec
+++ b/libffado.spec
@@ -1,7 +1,7 @@
 Summary:        Free firewire audio driver library
 Name:           libffado
 Version:        2.2.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 # src/libutil/float_cast.h is LGPLv2+.
 # The rest is (GPLv2 or GPLv3)
 License:        LGPLv2+ and (GPLv2 or GPLv3)
@@ -16,6 +16,7 @@ Source9:        libffado-snapshot.sh
 # http://subversion.ffado.org/ticket/293
 Patch0:         libffado-api-doc-only.patch
 Patch1:         libffado-errno.patch
+Patch2:         libffado-gcc6.patch
 
 BuildRequires:  alsa-lib-devel
 BuildRequires:  dbus-c++-devel
@@ -71,6 +72,7 @@ Applications and utilities for use with libffado.
 %setup -q
 %patch0 -p1 -b .api.doc.only
 %patch1 -p1 -b .errno
+%patch2 -p1 -b .gcc6
 
 # We don't want to install all tests
 sed -i '/Install/d' tests/{,*/}SConscript
@@ -141,6 +143,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Tue Mar 01 2016 Yaakov Selkowitz <yselkowi@redhat.com> - 2.2.1-8
+- Fix FTBFS with GCC 6 (#1307721)
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild