diff --git a/codeblocks-16.01-gcc7.patch b/codeblocks-16.01-gcc7.patch
new file mode 100644
index 0000000..66630a8
--- /dev/null
+++ b/codeblocks-16.01-gcc7.patch
@@ -0,0 +1,23 @@
+From d62ca21c500383fbe23fbb88a6840bda5e679f8f Mon Sep 17 00:00:00 2001
+From: Jens Lody <jens@codeblocks.org>
+Date: Fri, 10 Feb 2017 21:24:29 +0100
+Subject: Build fix for gcc 7.
+
+
+diff --git a/src/include/scripting/sqplus/sqplus.h b/src/include/scripting/sqplus/sqplus.h
+index 73f37b2..ae7d3c7 100644
+--- a/src/include/scripting/sqplus/sqplus.h
++++ b/src/include/scripting/sqplus/sqplus.h
+@@ -154,10 +154,10 @@ struct ScriptStringVar : ScriptStringVarBase {
+     return safeStringCopy(s,_s.s,MaxLength);
+   }
+   bool operator == (const ScriptStringVar & _s) {
+-    return _strcmp(s,_s.s) == 0;
++    return strcmp(s,_s.s) == 0;
+   }
+   bool compareCaseInsensitive(const ScriptStringVar & _s) {
+-    return _stricmp(s,_s.s) == 0;
++    return strcasecmp(s,_s.s) == 0;
+   }
+ };
+ 
diff --git a/codeblocks.spec b/codeblocks.spec
index b73a3dc..505fd3f 100644
--- a/codeblocks.spec
+++ b/codeblocks.spec
@@ -7,7 +7,7 @@
 
 Name:		codeblocks
 Version:	16.01
-Release:	3%{?svnrelease}%{?dist}
+Release:	4%{?svnrelease}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 License:	GPLv3+
 URL:		http://www.codeblocks.org/
@@ -34,6 +34,8 @@ Patch3:		codeblocks-16.01-unbundle.patch
 Patch4:		codeblocks-16.01-gcc6.patch
 # set Fedora specific path for spellchecker
 Patch5:		codeblocks-16.01-spellchecker-settings.patch
+# fix malformed code to build with gcc7
+Patch6:		codeblocks-16.01-gcc7.patch
 
 BuildRequires:	libtool
 BuildRequires:	wxGTK-devel
@@ -131,6 +133,7 @@ cp %{SOURCE4} src/plugins/contrib/source_exporter/wxPdfDocument/samples/minimal/
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 %endif
 
 
@@ -401,6 +404,9 @@ fi
 
 
 %changelog
+* Fri Feb 10 2017 Jens Lody <fedora@jenslody.de> - 16.01-4
+- Fix gcc7 build-issue, due to malformed template code, also pushed upstream.
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 16.01-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild