diff --git a/doc/compile.txt b/doc/compile.txt
index 1a897c7..c614744 100644
--- a/doc/compile.txt
+++ b/doc/compile.txt
@@ -8,7 +8,7 @@ Prerequisites
 Before you try to compile µHub, please make sure the following prerequisites are met.
   * GNU make
   * gcc > 3.0 (or MinGW on Windows)
-  * libevent >= 1.3
+  * libevent >= 1.3 ( not require on Linux)
   * Perl 5
 
 Linux and Mac OSX
diff --git a/doc/init.d.RedHat/etc/logrotate.d/uhub b/doc/init.d.RedHat/etc/logrotate.d/uhub
index fe29525..a0849cb 100644
--- a/doc/init.d.RedHat/etc/logrotate.d/uhub
+++ b/doc/init.d.RedHat/etc/logrotate.d/uhub
@@ -2,7 +2,7 @@
 # see man logrotate
 #
 #
-/var/log/uhub.log {                                                                                  
+/var/log/uhub.log {
         compress
         size 10M
         rotate 10
diff --git a/doc/init.d.RedHat/etc/sysconfig/uhub b/doc/init.d.RedHat/etc/sysconfig/uhub
index cb5f6d3..29f1c88 100644
--- a/doc/init.d.RedHat/etc/sysconfig/uhub
+++ b/doc/init.d.RedHat/etc/sysconfig/uhub
@@ -9,7 +9,5 @@
 #  -u <user>   Run as given user
 #  -g <group>  Run with given group permissions
 #  -p <file>   Store pid in file (process id)
-                                 
-                                                                                                                                             
 UHUBOPTIONS=" -u uhub -f -p /var/run/uhub.pid -l /var/log/uhub.log"
 
diff --git a/doc/uhub.ebuild b/doc/uhub.ebuild
index 64ca06b..0932ee2 100644
--- a/doc/uhub.ebuild
+++ b/doc/uhub.ebuild
@@ -1,24 +1,43 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
+inherit eutils
+
+if [ "$PV" != "9999" ]; then
+        SRC_URI="http://www.extatic.org/downloads/uhub/${P}-src.tar.bz2"
+        KEYWORDS="~amd64 ~x86"
+else
+        inherit git
+        SRC_URI=""
+        EGIT_REPO_URI="git://github.com/janvidar/uhub.git"
+        KEYWORDS=""
+fi
+
 EAPI="2"
 
 DESCRIPTION="High performance ADC hub"
 HOMEPAGE="http://www.uhub.org/"
-SRC_URI="http://www.extatic.org/downloads/uhub/${P}-src.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE="+ssl"
 
-DEPEND="=dev-lang/perl-5*
+DEPEND=">=dev-libs/libevent-1.3
+=dev-lang/perl-5*
 ssl? ( >=dev-libs/openssl-0.9.8 )
 "
 RDEPEND="${DEPEND}"
-src_install() {
-        mkdir -p ${D}/usr/bin
-        mkdir -p ${D}/etc/uhub
-        emake DESTDIR="${D}" UHUB_PREFIX="${D}/usr" install || die "install failed"
+src_compile() {
+        $opts=""
+        use ssl && opts="USE_SSL=YES $opts"
+        emake $opts
+}
+src_install() {
+        dodir /usr/bin
+        dodir /etc/uhub
+        emake DESTDIR="${D}" UHUB_PREFIX="${D}/usr" install || die "install failed"
+        newinitd doc/uhub.gentoo.rc uhub || newinitd ${FILESDIR}/uhub.rc uhub
+}
+pkg_postinst() {
+        enewuser uhub
 }
-