diff --git a/kaffeine-gcc6.patch b/kaffeine-gcc6.patch
new file mode 100644
index 0000000..1735d38
--- /dev/null
+++ b/kaffeine-gcc6.patch
@@ -0,0 +1,32 @@
+--- a/src/dvb/dvbdevice.cpp
++++ b/src/dvb/dvbdevice.cpp
+@@ -353,8 +353,8 @@
+ 
+ 	switch (config->configuration) {
+ 	case DvbConfigBase::DiseqcSwitch: {
+-		char cmd[] = { 0xe0, 0x10, 0x38, 0x00 };
+-		cmd[3] = 0xf0 | (config->lnbNumber << 2) | (horPolar ? 2 : 0) | (highBand ? 1 : 0);
++		char cmd[] = { char(0xe0), 0x10, 0x38, 0x00 };
++		cmd[3] = 0xf0 | char(config->lnbNumber << 2) | (horPolar ? 2 : 0) | (highBand ? 1 : 0);
+ 		backend->sendMessage(cmd, sizeof(cmd));
+ 		usleep(15000);
+ 
+@@ -399,7 +399,7 @@
+ 			value |= 0xd000;
+ 		}
+ 
+-		char cmd[] = { 0xe0, 0x31, 0x6e, (value / 256), (value % 256) };
++		char cmd[] = { char(0xe0), 0x31, 0x6e, char(value / 256), char(value % 256) };
+ 		backend->sendMessage(cmd, sizeof(cmd));
+ 		usleep(15000);
+ 		moveRotor = true;
+@@ -407,7 +407,7 @@
+ 	    }
+ 
+ 	case DvbConfigBase::PositionsRotor: {
+-		char cmd[] = { 0xe0, 0x31, 0x6b, config->lnbNumber };
++		char cmd[] = { char(0xe0), 0x31, 0x6b, char(config->lnbNumber) };
+ 		backend->sendMessage(cmd, sizeof(cmd));
+ 		usleep(15000);
+ 		moveRotor = true;
+
diff --git a/kaffeine.changes b/kaffeine.changes
index 2af8ab9..09401b7 100644
--- a/kaffeine.changes
+++ b/kaffeine.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jun 17 18:57:21 UTC 2016 - wbauer@tmo.at
+
+- Add kaffeine-gcc6.patch to fix build with gcc6 (boo#985371)
+
 -------------------------------------------------------------------
 Wed Feb 24 11:47:17 UTC 2016 - cgiboudeaux@gmx.com
 
diff --git a/kaffeine.spec b/kaffeine.spec
index f03ffc7..1d0722f 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -45,6 +45,8 @@ Patch7:         kaffeine-gcc47.patch
 Patch8:         support_for_sundtek_tv_tuners.patch
 #PATCH-FIX-UPSTREAM kaffeine-cmake34.patch -- Include files containing the functions used by the build system
 Patch9:         kaffeine-cmake34.patch
+# PATCH-FIX-UPSTREAM kaffeine-gcc6.patch boo#985371 wbauer@tmo.at -- fix build with gcc6
+Patch10:        kaffeine-gcc6.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 BuildRequires:  libkde4-devel
@@ -82,6 +84,7 @@ and Ogg Vorbis. It also handles Video CDs, DVDs, and DVB cards.
 %patch7
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 %build
 %cmake_kde4 -d build