diff --git a/tecnoballz-0.92-gcc6-narrowing.patch b/tecnoballz-0.92-gcc6-narrowing.patch
new file mode 100644
index 0000000..20167c3
--- /dev/null
+++ b/tecnoballz-0.92-gcc6-narrowing.patch
@@ -0,0 +1,33 @@
+diff -durN tecnoballz-0.92/include/tiles_background.h tecnoballz-0.92.gcc6/include/tiles_background.h
+--- tecnoballz-0.92/include/tiles_background.h	2007-09-25 07:43:20.000000000 +0200
++++ tecnoballz-0.92.gcc6/include/tiles_background.h	2016-03-26 17:59:30.283777384 +0100
+@@ -47,7 +47,7 @@
+     static tiles_background* tiles_background_singleton;
+     static Sint32 table_pos1[16];
+     static Sint32 table_pos2[16];
+-    static char couleurs[448];
++    static unsigned char couleurs[448];
+     static const Sint32 TILES_32_WIDTH = 32;
+     static const Sint32 TILES_32_HEIGHT = 32;
+     static const Sint32 TILES_64_WIDTH = 64;
+diff -durN tecnoballz-0.92/src/tiles_background.cc tecnoballz-0.92.gcc6/src/tiles_background.cc
+--- tecnoballz-0.92/src/tiles_background.cc	2007-09-25 07:43:20.000000000 +0200
++++ tecnoballz-0.92.gcc6/src/tiles_background.cc	2016-03-26 18:41:12.767764934 +0100
+@@ -663,7 +663,7 @@
+ 
+     }
+   palette_index = pal_index;
+-  char *color = &couleurs[0];
++  unsigned char *color = &couleurs[0];
+   unsigned char *colPT = (unsigned char *) (color) + pal_index;
+   SDL_Color *pal = display->get_palette ();
+   SDL_Color *lighted = pal + 1;
+@@ -702,7 +702,7 @@
+  * 4 * 4    : 16 composantes by palette
+  * 112 * 4  : 448 composantes
+ */
+-char
++unsigned char
+ tiles_background::couleurs[448] = {
+                                     0x00, 0x40, 0x20, 0x40, 0x00, 0x60, 0x40, 0x60, 0x00, 0x80, 0x60, 0x80,
+                                     0x00, 0xA0, 0x80, 0xA0, 0x00, 0x00, 0x20, 0x40, 0x00, 0x20,
diff --git a/tecnoballz.spec b/tecnoballz.spec
index b93f033..d663078 100644
--- a/tecnoballz.spec
+++ b/tecnoballz.spec
@@ -1,6 +1,6 @@
 Name: tecnoballz
 Version: 0.92
-Release: 23%{?dist}
+Release: 24%{?dist}
 Summary: A Brick Busting game
 
 Group: Amusements/Games
@@ -29,6 +29,9 @@ Patch5: tecnoballz-0.92-gcc43.patch
 # Hans de Goede
 # Drop setgid privileges when not needed
 Patch6: tecnoballz-0.92-dropsgid.patch
+# Raphael Groner/Upstream GIT
+# Compile with gcc 6
+Patch7: tecnoballz-0.92-gcc6-narrowing.patch
 
 BuildRequires: autoconf
 BuildRequires: SDL_image-devel
@@ -57,6 +60,7 @@ complete this great game. This game was ported from the Commodore Amiga.
 %patch4 -p1
 %patch5 -p2
 %patch6 -p1
+%patch7 -p1
 
 
 %build
@@ -107,6 +111,9 @@ fi
 
 
 %changelog
+* Sat Mar 26 2016 Andrea Musuruane <musuruan@gmail.com> - 0.92-24
+- Fix gcc6 narrowing. Thanks to Raphael Groner. Fix #1308179.
+
 * Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.92-23
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild