diff --git a/media-sound/forked-daapd/Manifest b/media-sound/forked-daapd/Manifest
index 5c7e7f1..18f015d 100644
--- a/media-sound/forked-daapd/Manifest
+++ b/media-sound/forked-daapd/Manifest
@@ -1,3 +1,3 @@
-AUX forked-daapd.init 1379 RMD160 54af22f9a39a4bd51830d572cb90a6f0beee0dec SHA1 38d8cc68e5ccae55d02e53072f88e6352ef6bfbf SHA256 41aec49b1232bedaa8b1c212a6725b1ff3d3ce0b9409050d167c20a32c363d8a
-DIST forked-daapd.git;a=snapshot;h=e3fb8f00cf4192a5e44c46c973964ea937bf4759;sf=tgz 140306 RMD160 2aebe24211cbba784d20a64939e6fd5a7b1a4d42 SHA1 3908d664cd9a8cdb7fe256e8404fbc2aaf942168 SHA256 68ad5e228befcbd737f44801d3dc924296146be025974a44bfbe3fc8bf9c4479
-EBUILD forked-daapd-0.11.ebuild 1656 RMD160 1cd2c4cef15cc64060e671e42e236d028559c733 SHA1 85dc8a9f4f99d719b697e804cc72cfb138d6ecb2 SHA256 474f1cf782dc418a02d25a33efc57ab9a6b838032db3ab74d58c00db9e616a53
+AUX forked-daapd.init 699 RMD160 10e7fce793399466b9c7d5007af5645b44a2ce82 SHA1 6ac6b9335f0214998e5c05b5e31bc216363d98bf SHA256 9628b3fa5633585b730d08b956c79c4366d4d78204e53e2fea105b3f407b8960
+DIST forked-daapd.git;a=snapshot;h=e3fb8f00cf4192a5e44c46c973964ea937bf4759;sf=tgz 140353 RMD160 a352b71defdcc3eb543568bc95e5d3434cb37447 SHA1 b385de41d38aa33161315df2eed466a9b518a24e SHA256 bfcd406d8b35d8fd47b534d24b0f76f658e41d4de61bea76eb9c561f2eff19f4
+EBUILD forked-daapd-0.11.ebuild 1714 RMD160 e7be85c0c15d6a0b71f6bdce768290727d6eb848 SHA1 619c2f42e357d65ce516094bb40dcbf5c805eca9 SHA256 aa664a83985121ed9cb30c70d5ea25530505d91ee1b49ac0a6a1d70f495bf87f
diff --git a/media-sound/forked-daapd/files/forked-daapd.init b/media-sound/forked-daapd/files/forked-daapd.init
index 451ae6b..0e1e724 100755
--- a/media-sound/forked-daapd/files/forked-daapd.init
+++ b/media-sound/forked-daapd/files/forked-daapd.init
@@ -2,31 +2,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-sound/forked-daapd/files/forked-daapd.init.2,v 1.4 2010/01/25 16:27:26 patrick Exp $
-# Somehow based on init.d file shipped with forked-daapd itself.
 #
-# You can run multiple copies of this service just symlinking them to
-# forked-daapd.<name>, then it will load /etc/forked-daapd.d/<name>.conf as config
-# file.
-# Remember to give them different logs and cache directories.
-#
-# The main instance (with no <name>) uses /etc/forked-daapd.conf
 
-# Check for OpenRC/Baselayout 2 -- see bug #230917
-if [ -f /lib/librc.so -o -f /etc/init.d/sysfs -o -f /lib/rc/version ]; then
-	myservice=$RC_SVCNAME
-fi
-
-CONF="${myservice##*.}"
-if [[ -n ${CONF} && ${myservice} != "forked-daapd" ]]; then
-	PIDFILE="/var/run/forked-daapd.${CONF}.pid"
-	CONFFILE="/etc/forked-daapd.d/${CONF}.conf"
-else
-	PIDFILE="/var/run/forked-daapd.pid"
-	CONFFILE="/etc/forked-daapd.conf"
-fi
+PIDFILE="/var/run/forked-daapd.pid"
+CONFFILE="/etc/forked-daapd.conf"
 
 depend() {
-	need net
+	need net avahi-daemon
 }
 
 start() {
diff --git a/media-sound/forked-daapd/forked-daapd-0.11.ebuild b/media-sound/forked-daapd/forked-daapd-0.11.ebuild
index 0b001ff..ada1d4f 100644
--- a/media-sound/forked-daapd/forked-daapd-0.11.ebuild
+++ b/media-sound/forked-daapd/forked-daapd-0.11.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/mt-daapd-0.3.0_pre1376.ebuild,v 1.3 2007/02/17 01:02:34 flameeyes Exp $
 
-inherit eutils flag-o-matic multilib
+inherit eutils flag-o-matic multilib autotools
 
 COMMIT="e3fb8f00cf4192a5e44c46c973964ea937bf4759"
 
@@ -12,7 +12,7 @@ EAPI='2'
 
 DESCRIPTION="A multi-threaded implementation of Apple's DAAP server"
 HOMEPAGE="http://www.jblache.org/projects/daapd/index.html"
-S=${WORKDIR}/forked-daapd
+
 user='daapd'
 group=${user}
 
@@ -22,12 +22,13 @@ KEYWORDS="~amd64 ~x86"
 IUSE="itunes flac"
 
 DEPEND="sys-libs/zlib
-    =dev-libs/antlr-c-3*
+	=dev-libs/antlr-c-3*
+	dev-java/antlr:3
 	dev-libs/confuse
 	>=dev-libs/libevent-1.4
-	>=dev-db/sqlite-3.5 
+	>=dev-db/sqlite-3.5[unlock-notify] 
 	>=dev-libs/libgcrypt-1.2.0
-	>=net-dns/avahi-0.6.24
+	>=net-dns/avahi-0.6.24[dbus]
 	media-video/ffmpeg
 	dev-libs/mini-xml
 	sys-libs/libavl
@@ -44,12 +45,16 @@ pkg_setup() {
 }
 
 src_unpack() {
-	cd ${WORKDIR}
-	cat ${DISTDIR}/${A} | tar xz
+	mkdir -p ${S}
+	cd ${S}
+	cat ${DISTDIR}/${A} | tar xz --strip=1
+}
+
+src_prepare() {
+	eautoreconf 
 }
 
 src_configure() {
-	autoreconf -i
 	append-flags -fno-strict-aliasing
 
 	econf \