diff --git a/packaging/gentoo/solaar.ebuild b/packaging/gentoo/solaar.ebuild
new file mode 100644
index 00000000..281919e0
--- /dev/null
+++ b/packaging/gentoo/solaar.ebuild
@@ -0,0 +1,28 @@
+#
+# 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
+
+    udev_dorules rules.d/*.rules
+
+    dodoc README.md COPYING
+}
+
+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/setup.py b/setup.py
index 06d5c142..2248c3a7 100755
--- a/setup.py
+++ b/setup.py
@@ -37,9 +37,10 @@ battery status.
       packages=['hidapi', 'logitech', 'logitech.unifying_receiver', 'solaar', 'solaar.ui'],
 
       data_files=[
-                  # ('share/applications', ['share/applications/solaar.desktop']),
                   ('share/icons/hicolor/128x128/apps', ['share/icons/solaar.png']),
                   ('share/solaar/icons', glob('share/icons/*.png')),
+                  # ('share/applications', ['share/applications/solaar.desktop']),
+                  # ('share/doc/solaar', glob('share/doc/solaar/*')),
                   # ('/etc/udev/rules.d', ['rules.d/99-logitech-unifying-receiver.rules']),
       	],
 
diff --git a/share/applications/solaar.desktop b/share/applications/solaar.desktop
index 7ece0187..da60a317 100644
--- a/share/applications/solaar.desktop
+++ b/share/applications/solaar.desktop
@@ -6,4 +6,5 @@ Icon=solaar.png
 StartupNotify=false
 Terminal=false
 Type=Application
-Categories=Utility;
+Categories=Utility;GTK;
+#Categories=Utility;GTK;Settings;HardwareSettings;