diff --git a/media-sound/forked-daapd/Manifest b/media-sound/forked-daapd/Manifest
index 18f015d..060cf3c 100644
--- a/media-sound/forked-daapd/Manifest
+++ b/media-sound/forked-daapd/Manifest
@@ -1,3 +1,5 @@
 AUX forked-daapd.init 699 RMD160 10e7fce793399466b9c7d5007af5645b44a2ce82 SHA1 6ac6b9335f0214998e5c05b5e31bc216363d98bf SHA256 9628b3fa5633585b730d08b956c79c4366d4d78204e53e2fea105b3f407b8960
+DIST forked-daapd-0.12.tar.gz 583714 RMD160 ac59e948064bb9c65cbc1c40abb6cf2a4178edfc SHA1 b5b6827b38f356b3b081b5b408cbdc919a5ae49c SHA256 54e4a445b80647973f99fc1ba1db1ec2090b0116951a8c8d434b1e7d4514b8ea
 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
+EBUILD forked-daapd-0.12.ebuild 1710 RMD160 f3173a140d3e227a20d668d070a2d23c59c1b736 SHA1 c52ebdd3ec026005fb9e66a4107fd9213cb060e6 SHA256 ee7dd055e5c07eff3b47e69164b0e68762f16dd7b3ddc370016698fe4561ac82
diff --git a/media-sound/forked-daapd/forked-daapd-0.12.ebuild b/media-sound/forked-daapd/forked-daapd-0.12.ebuild
new file mode 100644
index 0000000..ebda8ee
--- /dev/null
+++ b/media-sound/forked-daapd/forked-daapd-0.12.ebuild
@@ -0,0 +1,80 @@
+
+# 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 autotools
+
+COMMIT="e3fb8f00cf4192a5e44c46c973964ea937bf4759"
+
+SRC_URI="http://alioth.debian.org/~jblache/forked-daapd/${P}.tar.gz"
+RESTRICT="mirror"
+EAPI='2'
+
+DESCRIPTION="A multi-threaded implementation of Apple's DAAP server"
+HOMEPAGE="http://www.jblache.org/projects/daapd/index.html"
+
+user='daapd'
+group=${user}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="itunes flac"
+
+DEPEND="sys-libs/zlib
+	=dev-libs/antlr-c-3*
+	dev-java/antlr:3
+	dev-libs/confuse
+	>=dev-libs/libevent-1.4
+	>=dev-db/sqlite-3.5[unlock-notify] 
+	>=dev-libs/libgcrypt-1.2.0
+	>=net-dns/avahi-0.6.24[dbus]
+	media-video/ffmpeg
+	dev-libs/mini-xml
+	sys-libs/libavl
+	dev-libs/libunistring
+	vorbis? ( media-libs/libvorbis )
+	flac? ( media-libs/flac )
+	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() {
+	mkdir -p ${S}
+	cd ${S}
+	cat ${DISTDIR}/${A} | tar xz --strip=1
+}
+
+src_prepare() {
+	eautoreconf 
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	econf \
+		$(use_enable flac) \
+		$(use_enable itunes) \
+		|| die "configure failed"
+	emake || die "make failed"
+
+	cp ${FILESDIR}/${PN}.init ${WORKDIR}/initd
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+
+	newinitd ${WORKDIR}/initd ${PN}
+
+	keepdir /var/cache/forked-daapd 
+	fowners ${user}:${group} /var/cache/forked-daapd
+
+	dodoc AUTHORS ChangeLog NEWS README
+}
+
diff --git a/sys-libs/libavl/Manifest b/sys-libs/libavl/Manifest
index 722dbf4..f3321a7 100644
--- a/sys-libs/libavl/Manifest
+++ b/sys-libs/libavl/Manifest
@@ -1,3 +1,3 @@
 AUX libavl_0.3.5-3.diff.gz 2652 RMD160 ece32b5b70e0d489c977e0599cbe470b834dc094 SHA1 09001527368e8fbb37de977bd2ba903f377564ce SHA256 6c9e8af8f9fabae516d0f5a000cf44e1b21df67c23f1973e840414442a17698d
-DIST libavl_0.3.5.orig.tar.gz 14642 RMD160 55db560fc1e8137c5153d59a95ce322f456782ae SHA1 6e0226160980ec3e9a023e582026560f7e88d200 SHA256 4497b9e22cdd61ae2fa893b9d5fd6213dc306726d7c4be08c29e173622dca8a0
-EBUILD libavl-0.3.5-r3.ebuild 695 RMD160 63fb7cab850efdd540a04f4721507be5d2811bc2 SHA1 dd6e7cc8a3bc054d2e154131ca86c78296ab812a SHA256 fd754855ef5b10fdeab2fd8382efb2bf5feb17f451256a6f4afe3a5f23bff266
+DIST libavl_0.3.5.tar.gz 14642 RMD160 55db560fc1e8137c5153d59a95ce322f456782ae SHA1 6e0226160980ec3e9a023e582026560f7e88d200 SHA256 4497b9e22cdd61ae2fa893b9d5fd6213dc306726d7c4be08c29e173622dca8a0
+EBUILD libavl-0.3.5.ebuild 599 RMD160 92a03afc04db11d4bf13e9c6a70429a9a51d260a SHA1 efcbcee861bfa839ccd77d12d108fb8e6dadeb06 SHA256 ae825178393a8124de7e760667bcb81709d7954aaccc1789dba385ffd608afaf
diff --git a/sys-libs/libavl/libavl-0.3.5-r3.ebuild b/sys-libs/libavl/libavl-0.3.5.ebuild
similarity index 75%
rename from sys-libs/libavl/libavl-0.3.5-r3.ebuild
rename to sys-libs/libavl/libavl-0.3.5.ebuild
index cabc9e1..973b2b8 100644
--- a/sys-libs/libavl/libavl-0.3.5-r3.ebuild
+++ b/sys-libs/libavl/libavl-0.3.5.ebuild
@@ -6,7 +6,7 @@ inherit eutils
 
 DESCRIPTTON="A small implementation of AVL trees"
 HOMEPAGE="http://ftp.debian.org/debian/pool/main/liba/libavl"
-SRC_URI="http://ftp.debian.org/debian/pool/main/liba/libavl/${PN}_${PV}.orig.tar.gz"
+SRC_URI="http://alioth.debian.org/~jblache/forked-daapd/${PN}_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -19,13 +19,6 @@ RDEPEND="${DEPEND}"
 RESTRICT="mirror"
 S=${WORKDIR}/avl-${PV}
 
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}_${PV}-3.diff.gz
-}
-
 src_compile() {
 	cd ${S}
 	emake