diff --git a/media-sound/toolame/files/toolame-02l-gentoo.diff b/media-sound/toolame/files/toolame-02l-gentoo.diff
index 1b011600e7ef2..f96020f0a815b 100644
--- a/media-sound/toolame/files/toolame-02l-gentoo.diff
+++ b/media-sound/toolame/files/toolame-02l-gentoo.diff
@@ -1,5 +1,5 @@
---- Makefile	2003-03-02 08:07:02.000000000 +0100
-+++ Makefile.new	2003-04-14 14:00:10.000000000 +0200
+--- toolame-02l/Makefile	2003-03-02 08:07:02.000000000 +0100
++++ toolame-02l/Makefile.new	2003-04-14 14:00:10.000000000 +0200
 @@ -1,6 +1,3 @@
 -
 -CC = gcc
diff --git a/media-sound/toolame/toolame-02l-r4.ebuild b/media-sound/toolame/toolame-02l-r4.ebuild
new file mode 100644
index 0000000000000..19717aba0a5c9
--- /dev/null
+++ b/media-sound/toolame/toolame-02l-r4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="tooLAME - an optimized mpeg 1/2 layer 2 audio encoder"
+HOMEPAGE="http://www.planckenergy.com"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}/${P}-gentoo.diff"
+	"${FILESDIR}/${P}-uint.patch"
+	"${FILESDIR}/${P}-uint32_t.patch"
+)
+
+src_prepare() {
+	# fix #571774 by restoring pre-GCC5 inline semantics
+	append-cflags -std=gnu89
+
+	append-lfs-flags
+	tc-export CC
+
+	default
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc README HISTORY FUTURE html/* text/*
+}