diff --git a/packaging/gentoo/solaar-0.8.6.1.ebuild b/packaging/gentoo/solaar-0.8.6.1.ebuild
new file mode 100644
index 00000000..7552e812
--- /dev/null
+++ b/packaging/gentoo/solaar-0.8.6.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_2} )
+
+inherit distutils-r1 udev user linux-info gnome2-utils
+
+DESCRIPTION="Solaar is a Linux device manager for Logitech's Unifying Receiver peripherals"
+HOMEPAGE="http://pwr.github.com/Solaar/"
+SRC_URI="https://github.com/pwr/Solaar/archive/${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+RDEPEND="${PYTHON_DEPS}
+		 dev-python/pyudev
+		 dev-python/pygobject[${PYTHON_USEDEP}]"
+
+MY_P="Solaar-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( README.md COPYING COPYRIGHT ChangeLog )
+
+pkg_setup() {
+	enewgroup plugdev
+
+	CONFIG_CHECK="HID_LOGITECH_DJ"
+	linux-info_pkg_setup
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	udev_dorules rules.d/*.rules
+
+	if use doc; then
+		dodoc -r docs/*
+	fi
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	elog "To be able to use this application, the user must be on the plugdev group."
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postrm() { gnome2_icon_cache_update; }
+
diff --git a/packaging/gentoo/solaar.ebuild b/packaging/gentoo/solaar.ebuild
deleted file mode 100644
index 155d6645..00000000
--- a/packaging/gentoo/solaar.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# ebuild script by Carlos Silva
-#
-
-pkg_setup() {
-    enewgroup plugdev
-
-    CONFIG_CHECK="HID_LOGITECH_DJ"
-    linux-info_pkg_setup
-
-    python_pkg_setup
-}
-
-src_install() {
-    distutils_src_install
-
-    #insinto /usr/share
-    #doins -r share/icons
-
-    udev_dorules rules.d/*.rules
-
-    dodoc README.md COPYING COPYRIGHT
-    #if use doc; then
-    #    dodoc -r docs/*
-    #fi
-
-    dobin ${FILESDIR}/solaar ${FILESDIR}/solaar-cli
-}
-
-pkg_postinst() {
-    gnome2_icon_cache_update
-    elog "To be able to use this application, the user must be on the plugdev group."
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postrm() { gnome2_icon_cache_update; }