diff --git a/README.md b/README.md
index fdade0a9f..2f7112337 100644
--- a/README.md
+++ b/README.md
@@ -30,6 +30,10 @@ Setup
     <td>Ubuntu Linux</td>
     <td style="text-align: left"><a href="http://toolbelt.herokuapp.com/linux/readme"><code>apt-get</code> repository</a></td>
   </tr>
+  <tr>
+    <td>Gentoo Linux</td>
+    <td style="text-align: left"><a href="https://github.com/rpisarev/heroku/blob/gentoo/gentoo/heroku-2.39.4.ebuild"> ebuild for Gentoo</a></td>
+  </tr>
   <tr>
     <td>Other</td>
     <td style="text-align: left"><a href="http://assets.heroku.com/heroku-client/heroku-client.tgz">Tarball</a> (add contents to your <code>$PATH</code>)</td>
diff --git a/gentoo/Manifest b/gentoo/Manifest
new file mode 100644
index 000000000..45e1f09da
--- /dev/null
+++ b/gentoo/Manifest
@@ -0,0 +1,2 @@
+DIST heroku-client.tgz 659086 SHA256 a7ab4ede34d3ef32297708e050d9b950ef33e8e09d9f2c76e787a6efc7a7101d SHA512 735ca6ad8a7d7057bd218ddda073ac2628c59fafddbdab5ea570b9b67bb8e5b83a2f04d1e6f122519594b1999319245f8238849f71b9b1c160ca2cad2939766f WHIRLPOOL 8dc148986a3970be5e33bc1ae6620778e7d559fe2d5722be9590ca0008ab134ec504aeca3f64159297a66e036d7f14f4ebef1c52830f7b38d742ea148b074926
+EBUILD heroku-2.39.4.ebuild 874 SHA256 359714e67ae075a896292f46c3b48eed0e183175d5d1608c13e9ecb1150c5c33 SHA512 c34305a2db26118da06b3a94d76c6b42179a4b7466589d92b1fab93cf6dedda9451d3adf436e41b09a12ee3c5a1a66942d07888c9269782cde1ac7d75e50d393 WHIRLPOOL 1425a35f019461d395b7fe71a4560e58c893510897fd3caa2dab1ab3ce269c3d925cca6cba0c81d33dbe0dd4d823d0ee3c163b712198faf1ddad151d2b148641
diff --git a/gentoo/heroku-2.39.4.ebuild b/gentoo/heroku-2.39.4.ebuild
new file mode 100644
index 000000000..8fb52167d
--- /dev/null
+++ b/gentoo/heroku-2.39.4.ebuild
@@ -0,0 +1,38 @@
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="Client tools for heroku"
+HOMEPAGE="http://heroku.com"
+SRC_URI="http://assets.heroku.com.s3.amazonaws.com/heroku-client/heroku-client.tgz"
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND+="dev-lang/ruby"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+        unpack ${A}
+}
+
+S="${WORKDIR}/heroku-client"
+
+src_install() {
+	dodir "/usr/local/heroku"
+	cp -r ${S}/* ${D}/usr/local/heroku
+	dodir "/usr/local/bin"
+	dosym /usr/local/heroku/bin/heroku /usr/local/bin/heroku
+}
+
+pkg_postinst() {
+	einfo "To start using heroku, please create first an account at"
+	einfo "${HOMEPAGE}, then run"
+	einfo " \$ heroku login"
+	einfo "this will ask for your login data and generate a public ssh key"
+	einfo "for you if needed. To deploy your app do:"
+	einfo " \$ cd ~/myapp"
+	einfo " \$ heroku create"
+}