diff --git a/packaging/gentoo/current_stable_and_testing.ebuild b/packaging/gentoo/current_stable.ebuild
similarity index 100%
rename from packaging/gentoo/current_stable_and_testing.ebuild
rename to packaging/gentoo/current_stable.ebuild
diff --git a/packaging/gentoo/current_testing.ebuild b/packaging/gentoo/current_testing.ebuild
new file mode 100644
index 00000000..05483b62
--- /dev/null
+++ b/packaging/gentoo/current_testing.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# created by Steffen Schaumburg, steffen@schaumburger.info
+
+inherit eutils
+inherit games
+
+EAPI="2"
+NEED_PYTHON=2.5
+
+DESCRIPTION="A free/open source tracker/HUD for use with online poker"
+HOMEPAGE="http://fpdb.wiki.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/Snapshots/${P}.tar.bz2"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+#note: this should work on other architectures too, please send me your experiences
+
+IUSE="graph mysql postgres sqlite"
+RDEPEND="
+    mysql? ( virtual/mysql
+        dev-python/mysql-python )
+    postgres? ( dev-db/postgresql-server
+        dev-python/psycopg )
+    sqlite? ( dev-lang/python[sqlite]
+        dev-python/numpy )
+    >=x11-libs/gtk+-2.10
+    dev-python/pygtk
+    graph? ( dev-python/numpy
+        dev-python/matplotlib[gtk] )
+    dev-python/python-xlib
+    dev-python/pytz"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r gfx
+	doins -r pyfpdb
+	doins readme.txt
+
+	exeinto "${GAMES_DATADIR}"/${PN}
+	doexe run_fpdb.py
+
+	dodir "${GAMES_BINDIR}"
+	dosym "${GAMES_DATADIR}"/${PN}/run_fpdb.py "${GAMES_BINDIR}"/${PN}
+		
+	newicon gfx/fpdb-icon.png ${PN}.png
+	make_desktop_entry ${PN}
+
+	prepgamesdirs
+	fperms +x "${GAMES_DATADIR}"/${PN}/pyfpdb/*.pyw
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	elog "Note that if you really want to use mysql or postgresql you will have to create"
+   	elog "the database and user yourself and enter it into the fpdb config."
+	elog "You can find the instructions on the project's website."
+}
diff --git a/packaging/gentoo/readme.txt b/packaging/gentoo/readme.txt
index 66d3b452..e8317e9d 100644
--- a/packaging/gentoo/readme.txt
+++ b/packaging/gentoo/readme.txt
@@ -1,2 +1,5 @@
+If you want to run a stable version please use current_stable.ebuild
+If you want to run a testing version please use current_testing.ebuild
+
 To use the ebuild please simply copy it into your local portage tree and rename it to fpdb-version.ebuild, for example fpdb-0.20.1.ebuild or fpdb-0.20.902.ebuild.
 Here's a little howto on how to utilise 3rd party ebuilds such as this one: http://www.gentoo-wiki.info/HOWTO_Installing_3rd_Party_Ebuilds