diff --git a/ClanLib-1.0.0-gcc6.patch b/ClanLib-1.0.0-gcc6.patch
new file mode 100644
index 0000000..10eb5ca
--- /dev/null
+++ b/ClanLib-1.0.0-gcc6.patch
@@ -0,0 +1,16 @@
+diff -up ClanLib-1.0.0/Sources/Core/IOData/Generic/datafile_inputprovider.h~ ClanLib-1.0.0/Sources/Core/IOData/Generic/datafile_inputprovider.h
+--- ClanLib-1.0.0/Sources/Core/IOData/Generic/datafile_inputprovider.h~	2006-10-27 03:55:01.000000000 +0200
++++ ClanLib-1.0.0/Sources/Core/IOData/Generic/datafile_inputprovider.h	2016-02-02 18:21:30.332236599 +0100
+@@ -142,9 +142,9 @@ protected:
+ 		void insert(const std::string &resource_id, int data_pos, int data_size)
+ 		{
+ 			cache.insert(
+-				std::make_pair<std::string const, std::pair<int, int> >(
+-				resource_id,
+-				std::make_pair<int,int>(data_pos, data_size)));
++				std::pair<std::string const, std::pair<int, int> >(
++					resource_id,
++					std::pair<int,int>(data_pos, data_size)));
+ 		}
+ 
+ 	private:
diff --git a/ClanLib1.spec b/ClanLib1.spec
index f179329..b6ec990 100644
--- a/ClanLib1.spec
+++ b/ClanLib1.spec
@@ -3,7 +3,7 @@
 Summary:        Cross platform C++ game library
 Name:           ClanLib1
 Version:        1.0.0
-Release:        21%{?dist}
+Release:        22%{?dist}
 Group:          System Environment/Libraries
 License:        zlib
 URL:            http://www.clanlib.org/
@@ -16,6 +16,7 @@ Source1:        ClanLib-%{version}-generated-docs.tar.gz
 Patch0:         ClanLib-0.8.0-gcc43.patch
 Patch1:         ClanLib-1.0.0-fullscreen-viewport.patch
 Patch2:         ClanLib-1.0.0-libpng15.patch
+Patch3:         ClanLib-1.0.0-gcc6.patch
 BuildRequires:  libX11-devel libXi-devel libXmu-devel libGLU-devel libICE-devel
 BuildRequires:  libXext-devel libXxf86vm-devel libXt-devel xorg-x11-proto-devel
 BuildRequires:  libvorbis-devel mikmod-devel SDL-devel SDL_gfx-devel
@@ -46,6 +47,7 @@ ClanLib development headers and libraries
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 iconv -f iso8859-1 -t utf8 NEWS -o NEWS.utf8
 touch -r NEWS.utf8 NEWS
 mv NEWS.utf8 NEWS
@@ -98,6 +100,9 @@ done
 
 
 %changelog
+* Tue Feb 02 2016 Hans de Goede <hdegoede@redhat.com> - 1.0.0-22
+- Fix FTBFS with gcc6
+
 * Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.0-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild