diff --git a/media-libs/audiofile/audiofile-0.3.6.recipe b/media-libs/audiofile/audiofile-0.3.6.recipe
index 6d1c4bcb9..a2111c0a1 100644
--- a/media-libs/audiofile/audiofile-0.3.6.recipe
+++ b/media-libs/audiofile/audiofile-0.3.6.recipe
@@ -30,12 +30,17 @@ Supported compression formats:
 HOMEPAGE="https://audiofile.68k.org/"
 COPYRIGHT="1998-2013 Michael Pruett, Chris Pirazzi, Scott Porter, Doug Scott"
 LICENSE="GNU LGPL v2.1"
-REVISION="4"
+REVISION="5"
 SOURCE_URI="https://audiofile.68k.org/audiofile-0.3.6.tar.gz"
 CHECKSUM_SHA256="cdc60df19ab08bfe55344395739bb08f50fc15c92da3962fac334d3bff116965"
 
-ARCHITECTURES="x86 x86_64"
-SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
+SOURCE_FILENAME_2="audiofile-0.3.6-gcc6-build-fixes.patch"
+srcGitRev_2="1709d2d431a493deea7765902011730e04fab466"
+SOURCE_URI_2="https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/audiofile/files/$SOURCE_FILENAME_2?id=$srcGitRev_2#noarchive"
+CHECKSUM_SHA256_2="c088e405ae54bc560e7d203cc5a18edb829b555e675c363d789b0f3f2b4d5d0c"
+
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	audiofile$secondaryArchSuffix = $portVersion
@@ -59,7 +64,7 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:awk
-	cmd:gcc$secondaryArchSuffix
+	cmd:g++$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	"
@@ -67,6 +72,11 @@ BUILD_PREREQUIRES="
 defineDebugInfoPackage audiofile$secondaryArchSuffix \
 	"$libDir"/libaudiofile.so.1.0.0
 
+PATCH()
+{
+	patch -p1 -i "$sourceDir2"/$SOURCE_FILENAME_2
+}
+
 BUILD()
 {
 	runConfigure ./configure