diff --git a/dev-util/jenkins-bin/files/init.sh b/dev-util/jenkins-bin/files/init.sh
deleted file mode 100644
index 9a00a8f..0000000
--- a/dev-util/jenkins-bin/files/init.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-	need net
-	use dns logger mysql postgresql
-}
-
-JENKINS_PIDFILE=/run/jenkins/jenkins.pid
-JENKINS_WAR=/usr/lib/jenkins/jenkins.war
-
-RUN_AS=jenkins
-
-checkconfig() {
-if [ ! -n "$JENKINS_HOME" ] ; then
-	eerror "JENKINS_HOME not configured"
-	return 1
-fi
-if [ ! -d "$JENKINS_HOME" ] ; then
-	eerror "JENKINS_HOME directory does not exist: $JENKINS_HOME"
-	return 1
-fi
-return 0
-}
-
-start() {
-	checkconfig || return 1
-
-	[ -d /var/run/jenkins ] || mkdir /var/run/jenkins
-	JAVA_HOME=`java-config --jre-home`
-	COMMAND=$JAVA_HOME/bin/java
-
-	JAVA_PARAMS="$JENKINS_JAVA_OPTIONS -DJENKINS_HOME=$JENKINS_HOME -jar $JENKINS_WAR"
-
-	# Don't use --daemon here, because in this case stop will not work
-	PARAMS="--logfile=/var/log/jenkins/jenkins.log"
-	[ -n "$JENKINS_PORT" ] && PARAMS="$PARAMS --httpPort=$JENKINS_PORT"
-	[ -n "$JENKINS_DEBUG_LEVEL" ] && PARAMS="$PARAMS --debug=$JENKINS_DEBUG_LEVEL"
-	[ -n "$JENKINS_HANDLER_STARTUP" ] && PARAMS="$PARAMS --handlerCountStartup=$JENKINS_HANDLER_STARTUP"
-	[ -n "$JENKINS_HANDLER_MAX" ] && PARAMS="$PARAMS --handlerCountMax=$JENKINS_HANDLER_MAX"
-	[ -n "$JENKINS_HANDLER_IDLE" ] && PARAMS="$PARAMS --handlerCountMaxIdle=$JENKINS_HANDLER_IDLE"
-	[ -n "$JENKINS_ARGS" ] && PARAMS="$PARAMS $JENKINS_ARGS"
-
-	if [ "$JENKINS_ENABLE_ACCESS_LOG" = "yes" ]; then
-		PARAMS="$PARAMS --accessLoggerClassName=winstone.accesslog.SimpleAccessLogger --simpleAccessLogger.format=combined --simpleAccessLogger.file=/var/log/jenkins/access_log"
-	fi
-
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --quiet --background \
-		--make-pidfile --pidfile $JENKINS_PIDFILE \
-		--user $RUN_AS \
-		--exec "${COMMAND}" -- $JAVA_PARAMS $PARAMS
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --quiet --pidfile $JENKINS_PIDFILE
-	eend $?
-}
diff --git a/dev-util/jenkins-bin/files/conf b/dev-util/jenkins-bin/files/jenkins-bin.confd
similarity index 85%
rename from dev-util/jenkins-bin/files/conf
rename to dev-util/jenkins-bin/files/jenkins-bin.confd
index 2f87792..f84e346 100644
--- a/dev-util/jenkins-bin/files/conf
+++ b/dev-util/jenkins-bin/files/jenkins-bin.confd
@@ -43,3 +43,20 @@ JENKINS_HANDLER_IDLE="20"
 # Full option list: java -jar jenkins.war --help
 #
 JENKINS_ARGS=""
+
+#
+# User
+#
+JENKINS_USER=jenkins
+
+
+
+#
+# Pid File 
+#
+JENKINS_PIDFILE="/var/run/jenkins.pid"
+
+#
+# War File
+#
+JENKINS_WAR="/opt/jenkins/jenkins.war"
diff --git a/dev-util/jenkins-bin/files/jenkins-bin.init b/dev-util/jenkins-bin/files/jenkins-bin.init
new file mode 100644
index 0000000..f66cb30
--- /dev/null
+++ b/dev-util/jenkins-bin/files/jenkins-bin.init
@@ -0,0 +1,53 @@
+#!/sbin/runscript
+
+depend() {
+    need net
+    use dns logger mysql postgresql
+}
+
+checkconfig() {
+    if [ ! -n "$JENKINS_HOME" ] ; then
+        eerror "JENKINS_HOME not configured"
+        return 1
+    fi
+    if [ ! -d "$JENKINS_HOME" ] ; then
+        eerror "JENKINS_HOME directory does not exist: $JENKINS_HOME"
+        return 1
+    fi
+    return 0
+}
+
+start() {
+    checkconfig || return 1
+
+    JAVA_HOME=`java-config --jre-home`
+    COMMAND=$JAVA_HOME/bin/java
+
+    JAVA_PARAMS="$JENKINS_JAVA_OPTIONS -DJENKINS_HOME=$JENKINS_HOME -jar $JENKINS_WAR"
+
+    # Don't use --daemon here, because in this case stop will not work
+    PARAMS="--logfile=/var/log/jenkins/jenkins.log"
+    [ -n "$JENKINS_PORT" ] && PARAMS="$PARAMS --httpPort=$JENKINS_PORT"
+    [ -n "$JENKINS_DEBUG_LEVEL" ] && PARAMS="$PARAMS --debug=$JENKINS_DEBUG_LEVEL"
+    [ -n "$JENKINS_HANDLER_STARTUP" ] && PARAMS="$PARAMS --handlerCountStartup=$JENKINS_HANDLER_STARTUP"
+    [ -n "$JENKINS_HANDLER_MAX" ] && PARAMS="$PARAMS --handlerCountMax=$JENKINS_HANDLER_MAX"
+    [ -n "$JENKINS_HANDLER_IDLE" ] && PARAMS="$PARAMS --handlerCountMaxIdle=$JENKINS_HANDLER_IDLE"
+    [ -n "$JENKINS_ARGS" ] && PARAMS="$PARAMS $JENKINS_ARGS"
+
+    if [ "$JENKINS_ENABLE_ACCESS_LOG" = "yes" ]; then
+        PARAMS="$PARAMS --accessLoggerClassName=winstone.accesslog.SimpleAccessLogger --simpleAccessLogger.format=combined --simpleAccessLogger.file=/var/log/jenkins/access_log"
+    fi
+
+    ebegin "Starting ${SVCNAME}"
+    start-stop-daemon --start --quiet --background \
+        --make-pidfile --pidfile $JENKINS_PIDFILE \
+        --user ${JENKINS_USER} \
+        --exec "${COMMAND}" -- $JAVA_PARAMS $PARAMS
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping ${SVCNAME}"
+    start-stop-daemon --stop --quiet --pidfile $JENKINS_PIDFILE
+    eend $?
+}
diff --git a/dev-util/jenkins-bin/jenkins-bin-1.565.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.565.3.ebuild
index 463cdac..46b1da8 100644
--- a/dev-util/jenkins-bin/jenkins-bin-1.565.3.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-1.565.3.ebuild
@@ -1,24 +1,23 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/jenkins-bin/jenkins-bin-1.584.ebuild,v 1.1 2014/10/20 21:24:10 mrueg Exp $
 
-EAPI="5"
+EAPI=5
 
-inherit java-pkg-2 unpacker user
+inherit user
 
 DESCRIPTION="Extensible continuous integration server"
 HOMEPAGE="http://jenkins-ci.org/"
-SRC_URI="http://pkg.jenkins-ci.org/debian-stable/binary/jenkins_${PV}_all.deb"
-RESTRICT="mirror"
-
 LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
 SLOT="0"
-KEYWORDS="x86 amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-fonts/dejavu"
 RDEPEND="${DEPEND}
-	>=virtual/jdk-1.6"
+	>=virtual/jdk-1.5"
 
 S=${WORKDIR}
 
@@ -28,17 +27,14 @@ pkg_setup() {
 }
 
 src_install() {
-	keepdir /var/log/jenkins
+	keepdir /var/run/jenkins /var/log/jenkins
 	keepdir /var/lib/jenkins/home /var/lib/jenkins/backup
 
-	insinto /usr/lib/jenkins
-	doins usr/share/jenkins/jenkins.war
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
 
-	newinitd "${FILESDIR}/init.sh" jenkins
-	newconfd "${FILESDIR}/conf" jenkins
+	newinitd "${FILESDIR}"${PN}.init jenkins
+	newconfd "${FILESDIR}"${PN}.confd jenkins
 
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/jenkins
-
-	fowners jenkins:jenkins /var/log/jenkins /var/lib/jenkins /var/lib/jenkins/home /var/lib/jenkins/backup
+	fowners jenkins:jenkins /var/run/jenkins /var/log/jenkins /var/lib/jenkins /var/lib/jenkins/home /var/lib/jenkins/backup
 }
diff --git a/dev-util/jenkins-bin/jenkins-bin-1.583.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.583.ebuild
index a1cf6fc..46b1da8 100644
--- a/dev-util/jenkins-bin/jenkins-bin-1.583.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-1.583.ebuild
@@ -1,24 +1,23 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/jenkins-bin/jenkins-bin-1.584.ebuild,v 1.1 2014/10/20 21:24:10 mrueg Exp $
 
-EAPI="5"
+EAPI=5
 
-inherit java-pkg-2 unpacker user
+inherit user
 
 DESCRIPTION="Extensible continuous integration server"
 HOMEPAGE="http://jenkins-ci.org/"
-SRC_URI="http://pkg.jenkins-ci.org/debian/binary/jenkins_${PV}_all.deb"
-RESTRICT="mirror"
-
 LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-fonts/dejavu"
 RDEPEND="${DEPEND}
-	>=virtual/jdk-1.6"
+	>=virtual/jdk-1.5"
 
 S=${WORKDIR}
 
@@ -28,17 +27,14 @@ pkg_setup() {
 }
 
 src_install() {
-	keepdir /var/log/jenkins
+	keepdir /var/run/jenkins /var/log/jenkins
 	keepdir /var/lib/jenkins/home /var/lib/jenkins/backup
 
-	insinto /usr/lib/jenkins
-	doins usr/share/jenkins/jenkins.war
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
 
-	newinitd "${FILESDIR}/init.sh" jenkins
-	newconfd "${FILESDIR}/conf" jenkins
+	newinitd "${FILESDIR}"${PN}.init jenkins
+	newconfd "${FILESDIR}"${PN}.confd jenkins
 
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/jenkins
-
-	fowners jenkins:jenkins /var/log/jenkins /var/lib/jenkins /var/lib/jenkins/home /var/lib/jenkins/backup
+	fowners jenkins:jenkins /var/run/jenkins /var/log/jenkins /var/lib/jenkins /var/lib/jenkins/home /var/lib/jenkins/backup
 }