diff --git a/media-sound/hydrogen/files/hydrogen-0.9.5-gcc6.patch b/media-sound/hydrogen/files/hydrogen-0.9.5-gcc6.patch
new file mode 100644
index 0000000000000..586e82af22a1c
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-0.9.5-gcc6.patch
@@ -0,0 +1,12 @@
+diff -ruN hydrogen-0.9.5.orig/libs/hydrogen/src/local_file_mgr.cpp hydrogen-0.9.5/libs/hydrogen/src/local_file_mgr.cpp
+--- hydrogen-0.9.5.orig/libs/hydrogen/src/local_file_mgr.cpp	2011-01-29 00:33:23.000000000 +0100
++++ hydrogen-0.9.5/libs/hydrogen/src/local_file_mgr.cpp	2017-09-26 20:07:31.128723252 +0200
+@@ -980,7 +980,7 @@
+ 	
+ 	std::string playlistInfoFile = patternname;
+ 	std::ifstream verify( playlistInfoFile.c_str() , std::ios::in | std::ios::binary );
+-	if ( verify == NULL ) {
++	if ( !verify ) {
+ 		//ERRORLOG( "Load Playlist: Data file " + playlistInfoFile + " not found." );
+ 		return NULL;
+ 	}
diff --git a/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild b/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild
index 04efe86d05611..0a19547038c7b 100644
--- a/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild
+++ b/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -31,7 +31,8 @@ src_prepare() {
 	epatch \
 		patches/portaudio.patch \
 		"${FILESDIR}"/${P}-use_lrdf_pkgconfig.patch \
-		"${FILESDIR}"/${P}-gcc47.patch
+		"${FILESDIR}"/${P}-gcc47.patch \
+		"${FILESDIR}"/${P}-gcc6.patch
 }
 
 src_compile() {