diff --git a/yoshimi-gcc6.patch b/yoshimi-gcc6.patch
new file mode 100644
index 0000000..18568b1
--- /dev/null
+++ b/yoshimi-gcc6.patch
@@ -0,0 +1,45 @@
+From 1d5190dbe11629dfa8e32b7959db593780c757eb Mon Sep 17 00:00:00 2001
+From: abrolag <willgodfrey@musically.me.uk>
+Date: Mon, 8 Feb 2016 23:01:46 +0000
+Subject: [PATCH] gcc 6 error fix?
+
+---
+ src/Effects/Alienwah.cpp  | 4 ++--
+ src/Misc/CmdInterface.cpp | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/Effects/Alienwah.cpp b/src/Effects/Alienwah.cpp
+index 1c794cf..41e1a30 100644
+--- a/src/Effects/Alienwah.cpp
++++ b/src/Effects/Alienwah.cpp
+@@ -70,7 +70,7 @@ void Alienwah::out(float *smpsl, float *smpsr)
+         tmp = clfol * x + oldclfol * x1;
+ 
+         out = tmp * oldl[oldk];
+-        out.real() += (1 - abs(fb)) * smpsl[i] * pangainL;
++        out += (1 - abs(fb)) * smpsl[i] * pangainL;
+ 
+         oldl[oldk] = out;
+         float l = out.real() * 10.0f * (fb + 0.1f);
+@@ -79,7 +79,7 @@ void Alienwah::out(float *smpsl, float *smpsr)
+         tmp = clfor * x + oldclfor * x1;
+ 
+         out = tmp * oldr[oldk];
+-        out.real() += (1 - abs(fb)) * smpsr[i] * pangainR;
++        out += (1 - abs(fb)) * smpsr[i] * pangainR;
+ 
+         oldr[oldk] = out;
+         float r = out.real() * 10.0f * (fb + 0.1f);
+diff --git a/src/Misc/CmdInterface.cpp b/src/Misc/CmdInterface.cpp
+index 061a420..3947f05 100644
+--- a/src/Misc/CmdInterface.cpp
++++ b/src/Misc/CmdInterface.cpp
+@@ -228,7 +228,7 @@ void CmdInterface::helpLoop(list<string>& msg, string *commands, int indent)
+     while (commands[word] != "end")
+     {
+         left = commands[word];
+-        msg.push_back(dent.assign<int>(indent, ' ') + left + blanks.assign<int>(spaces - left.length(), ' ') + "- " + commands[word + 1]);
++        msg.push_back(dent.assign(indent, ' ') + left + blanks.assign(spaces - left.length(), ' ') + "- " + commands[word + 1]);
+         word += 2;
+     }
+ }
diff --git a/yoshimi.spec b/yoshimi.spec
index 710d935..9ce0e96 100644
--- a/yoshimi.spec
+++ b/yoshimi.spec
@@ -1,6 +1,6 @@
 Name:		yoshimi
 Version:	1.3.8.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Rewrite of ZynAddSubFx aiming for better JACK support
 
 Group:		Applications/Multimedia
@@ -9,6 +9,7 @@ URL:		http://sourceforge.net/projects/%{name}
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Source1:	%{name}.desktop
 Patch0:		%{name}-cflags.patch
+Patch1:		%{name}-gcc6.patch
 
 BuildRequires:	jack-audio-connection-kit-devel
 BuildRequires:	cmake 
@@ -40,6 +41,7 @@ effects like Reverb, Echo, Chorus, Phaser...
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 cd src
@@ -98,6 +100,9 @@ fi
 %{_mandir}/man1/yoshimi.1*
 
 %changelog
+* Sat Feb 13 2016 Adam Huffman <bloch@verdurin.com> - 1.3.8.2-2
+- Patch for GCC6 build fixes
+
 * Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.8.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild