diff --git a/ColPack.changes b/ColPack.changes
index c9cf297..1362b3f 100644
--- a/ColPack.changes
+++ b/ColPack.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed May 25 09:51:32 UTC 2016 - martin.liska@suse.com
+
+- Add gcc6-fix-errors.patch to remove errors seen by GCC6.
+
 -------------------------------------------------------------------
 Thu Oct 18 09:25:19 UTC 2012 - kkhere.geo@gmail.com
 
diff --git a/ColPack.spec b/ColPack.spec
index 890caaf..028afbe 100644
--- a/ColPack.spec
+++ b/ColPack.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ColPack
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -27,6 +27,8 @@ Url:            http://www.cscapes.org/coloringpage/
 Source:         http://www.cscapes.org/download/ColPack/%{name}-%{version}.tar.gz
 Source2:        baselibs.conf
 Patch1:         colpack-return-in-non-void.patch
+# PATCH-FIX-OPENSUSE gcc6-fix-errors.patch -- Fix errors seen by GCC6.
+Patch2:         gcc6-fix-errors.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  gcc-c++
@@ -69,6 +71,7 @@ This package provides the development environment for ColPack
 %prep
 %setup -q -n %{name}-%{version}
 %patch1 -p1
+%patch2 -p1
 
 %build
 autoreconf -v --install --force
diff --git a/gcc6-fix-errors.patch b/gcc6-fix-errors.patch
new file mode 100644
index 0000000..ada50ec
--- /dev/null
+++ b/gcc6-fix-errors.patch
@@ -0,0 +1,47 @@
+--- ColPack-1.0.9/Utilities/extra.cpp	2012-02-04 04:00:14.000000000 +0100
++++ ColPack-1.0.9/Utilities/extra.cpp	2016-05-25 11:47:41.593922991 +0200
+@@ -49,7 +49,7 @@
+ 
+     ofstream out_Matrix (s_MatrixName.c_str());
+     if(!out_Matrix) {
+-	    cout<<"Error creating file: \""<<out_Matrix<<"\""<<endl;
++	    cout<<"Error creating file: \""<<s_MatrixName<<"\""<<endl;
+ 	    exit(1);
+     }
+     
+@@ -84,7 +84,7 @@
+     string s_MatrixName = "pattern"+s_postfix+s_BaseName;
+     ofstream out_Matrix (s_MatrixName.c_str());
+     if(!out_Matrix) {
+-	    cout<<"Error creating file: \""<<out_Matrix<<"\""<<endl;
++	    cout<<"Error creating file: \""<<s_MatrixName<<"\""<<endl;
+ 	    exit(1);
+     }
+ 
+@@ -111,7 +111,7 @@
+     string s_CompressedMatrixName = "CompressedMatrix"+s_postfix+s_BaseName;
+     ofstream out_CompressedMatrix (s_CompressedMatrixName.c_str());
+     if(!out_CompressedMatrix) {
+-	    cout<<"Error creating file: \""<<out_CompressedMatrix<<"\""<<endl;
++	    cout<<"Error creating file: \""<<s_CompressedMatrixName<<"\""<<endl;
+ 	    exit(1);
+     }
+     
+@@ -140,7 +140,7 @@
+     string s_MatrixName = "pattern_value"+s_postfix+s_BaseName;
+     ofstream out_Matrix (s_MatrixName.c_str());
+     if(!out_Matrix) {
+-	    cout<<"Error creating file: \""<<out_Matrix<<"\""<<endl;
++	    cout<<"Error creating file: \""<<s_MatrixName<<"\""<<endl;
+ 	    exit(1);
+     }
+ 
+@@ -167,7 +167,7 @@
+     string s_CompressedMatrixName = "CompressedMatrix"+s_postfix+s_BaseName;
+     ofstream out_CompressedMatrix (s_CompressedMatrixName.c_str());
+     if(!out_CompressedMatrix) {
+-	    cout<<"Error creating file: \""<<out_CompressedMatrix<<"\""<<endl;
++	    cout<<"Error creating file: \""<<s_CompressedMatrixName<<"\""<<endl;
+ 	    exit(1);
+     }
+