diff --git a/media-sound/forked-daapd/Manifest b/media-sound/forked-daapd/Manifest
index 459f5d4..7380c07 100644
--- a/media-sound/forked-daapd/Manifest
+++ b/media-sound/forked-daapd/Manifest
@@ -1,3 +1,3 @@
-AUX forked-daapd.init 1357 RMD160 a7698ca0576ada15cd58f086bf6c1811a37a475b SHA1 cf1e6faf5a96b7ce332508e532e043bbdca2a91b SHA256 3bd44811e6de2d5da2d26cec7cf595ea2060ca650ec777b7bee20f992df3dccf
+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 1476 RMD160 ada42fdf3b12e66f20c35eaac145c999aae881b7 SHA1 6696d7a7c36a24c511399ad083ed20c541a127bd SHA256 cce3d147d1d23e43fa399a4b069fd1a9436e615b28e9c0f672b9514a1d1bbb87
+EBUILD forked-daapd-0.11.ebuild 1654 RMD160 0e1f9eee25671550a8bce797c83beca647322447 SHA1 608fb2d4229cc44499665dba21b340ced05b592b SHA256 2982b0125de882529ab0bf97b6d0e02937385596fe9e91cbbc696f67fd92a734
diff --git a/media-sound/forked-daapd/files/forked-daapd.init b/media-sound/forked-daapd/files/forked-daapd.init
index 6c3b443..451ae6b 100755
--- a/media-sound/forked-daapd/files/forked-daapd.init
+++ b/media-sound/forked-daapd/files/forked-daapd.init
@@ -1,15 +1,15 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/files/mt-daapd.init.2,v 1.4 2010/01/25 16:27:26 patrick Exp $
-# Somehow based on init.d file shipped with mt-daapd itself.
+# $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
-# mt-daapd.<name>, then it will load /etc/mt-daapd.d/<name>.conf as config
+# 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/mt-daapd.conf
+# 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
@@ -17,28 +17,27 @@ if [ -f /lib/librc.so -o -f /etc/init.d/sysfs -o -f /lib/rc/version ]; then
 fi
 
 CONF="${myservice##*.}"
-if [[ -n ${CONF} && ${myservice} != "mt-daapd" ]]; then
-	PIDFILE="/var/run/mt-daapd.${CONF}.pid"
-	CONFFILE="/etc/mt-daapd.d/${CONF}.conf"
+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/mt-daapd.pid"
-	CONFFILE="/etc/mt-daapd.conf"
+	PIDFILE="/var/run/forked-daapd.pid"
+	CONFFILE="/etc/forked-daapd.conf"
 fi
 
 depend() {
 	need net
-	#USEHOWL need mDNSResponderPosix
 }
 
 start() {
-	ebegin "Starting mt-daapd DAAP server"
+	ebegin "Starting forked-daapd DAAP server"
 	start-stop-daemon --start --quiet --pidfile ${PIDFILE} \
-		--exec /usr/sbin/mt-daapd -- -P ${PIDFILE} -c ${CONFFILE}
+		--exec /usr/sbin/forked-daapd -- -P ${PIDFILE} -c ${CONFFILE}
 	eend $?
 }
 
 stop() {
-	ebegin "Stopping mt-daapd DAAP server"
+	ebegin "Stopping forked-daapd DAAP server"
 	start-stop-daemon --stop --quiet --pidfile ${PIDFILE} --signal 2
 	eend $?
 
diff --git a/media-sound/forked-daapd/forked-daapd-0.11.ebuild b/media-sound/forked-daapd/forked-daapd-0.11.ebuild
index 10c3532..9244d65 100644
--- a/media-sound/forked-daapd/forked-daapd-0.11.ebuild
+++ b/media-sound/forked-daapd/forked-daapd-0.11.ebuild
@@ -13,11 +13,13 @@ 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}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="vorbis flac ffmpeg itunes musepack"
+IUSE="itunes flac"
 
 DEPEND="sys-libs/zlib
     =dev-libs/antlr-c-3*
@@ -34,6 +36,13 @@ DEPEND="sys-libs/zlib
 	musepack? ( media-libs/taglib )
 	itunes? ( app-pda/libplist )"
 
+pkg_setup() {
+	ebegin "Creating nginx user and group"
+	enewgroup ${group}
+	enewuser ${user} -1 -1 -1 ${group}
+	eend ${?}
+}
+
 src_unpack() {
 	cd ${WORKDIR}
 	cat ${DISTDIR}/${A} | tar xz
@@ -58,6 +67,7 @@ src_install() {
 	newinitd ${WORKDIR}/initd ${PN}
 
 	keepdir /var/cache/forked-daapd 
+	fowners ${user}:${group} /var/cache/forked-daapd
 
 	dodoc AUTHORS ChangeLog NEWS README
 }