diff --git a/net-misc/twonkymedia/ChangeLog b/net-misc/twonkymedia/ChangeLog
new file mode 100644
index 0000000..1194db1
--- /dev/null
+++ b/net-misc/twonkymedia/ChangeLog
@@ -0,0 +1,14 @@
+# ChangeLog for net-misc/twonkymedia
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  30 Dec 2011; Mario Fetka <mario.fetka@gmail.com> +twonkymedia-6.0.38.ebuild,
+  +metadata.xml, files/twonkymedia.initd:
+  initial ebuild
+
+*twonkymedia-6.0.38 (30 Dec 2011)
+
+  30 Dec 2011; Mario Fetka <mario.fetka@gmail.com> +twonkymedia-6.0.38.ebuild,
+  +metadata.xml, files/twonkymedia.initd:
+  initial ebuild
+
diff --git a/net-misc/twonkymedia/Manifest b/net-misc/twonkymedia/Manifest
new file mode 100644
index 0000000..18cbf24
--- /dev/null
+++ b/net-misc/twonkymedia/Manifest
@@ -0,0 +1,7 @@
+AUX twonkymedia.initd 2361 RMD160 f81ab9d6f8e3658f020a1b4ecc9e31b9b82876f9 SHA1 2aa0a1355ed686e99377e1085b789296b5ca7ea6 SHA256 1c996a62923f0de9b5d8509f486f5a4b14b0e1b8171383184eb9bf394f4469aa
+DIST twonkymedia-armel-glibc-2.2.5-6.0.38.zip 2113595 RMD160 15e162e6e5463e9d020c069a4189c2d0c20f1e16 SHA1 13a042a2c85ae0a7941467dd48714b52da41f1c7 SHA256 42eea3db594eefd8660834e732003f6507212a262c25f743d8a7a4ca81299c95
+DIST twonkymedia-i386-glibc-2.2.5-6.0.38.zip 3400110 RMD160 bbc76d96cf2e1410fcda4c043ed4d2a3ff7d5c09 SHA1 79f16a329f0de05d4aa9bd23062d185371b4a5f7 SHA256 231b9208aa131f3e16e5bc41dbf389fa3ee437d3d316d4b6412ea821e571ab7a
+DIST twonkymedia-kirkwood-6.0.38.zip 2115297 RMD160 3467737645d21c6127c6cc088af58008441af82b SHA1 467f68513f001cb74511843c731f53ac8c9960ce SHA256 5716ee36dda9d095a880a0e830f33e2e0acf01d8fa241784279dac41a6808c1c
+EBUILD twonkymedia-6.0.38.ebuild 1975 RMD160 8d9c083be888398add8f327f55328a6a580c81c0 SHA1 b4edae16c2d7187d08c37ffc78a3c04b787e71d3 SHA256 241583910aae20e1e1ff33e61b099f679e2be1fbf190b4873cdf11f04e78cfc2
+MISC ChangeLog 434 RMD160 317cfb89bb71e362007f1956dbe59519b20a8d1e SHA1 546e4d55b302f692cf01b5026aac18af5106d2cc SHA256 a77265e490fec64daee716a065ffad7254db09e7de650e38c20fd17a0e31ed56
+MISC metadata.xml 273 RMD160 fd634a688251c96fd5e2d5f29a222b071c9c586c SHA1 16438f51395f23bb3255df3c1f962b92037a6be8 SHA256 9538d9b03de39acce753f3b37c282c146e6de540b37588aee26b1a2b404dde1d
diff --git a/net-misc/twonkymedia/files/twonkymedia.initd b/net-misc/twonkymedia/files/twonkymedia.initd
index 4c22009..5b4a15e 100644
--- a/net-misc/twonkymedia/files/twonkymedia.initd
+++ b/net-misc/twonkymedia/files/twonkymedia.initd
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-libs/openslp/files/slpd-init,v 1.4 2007/07/13 13:20:28 uberlord Exp $
 
@@ -78,12 +78,12 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 	ebegin "Starting Twonky Media Server"
-	start-stop-daemon --start --quiet --exec /usr/sbin/slpd --pidfile /var/run/slpd.pid
+	start-stop-daemon --start --quiet --exec /opt/twonkymedia --pidfile /var/run/mediaserver.pid -- -D
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping Twonky Media Server"
-	start-stop-daemon --stop --quiet --pidfile /var/run/slpd.pid
+	start-stop-daemon --stop --quiet --pidfile /var/run/mediaserver.pid
 	eend $?
 }
diff --git a/net-misc/twonkymedia/metadata.xml b/net-misc/twonkymedia/metadata.xml
new file mode 100644
index 0000000..5b11336
--- /dev/null
+++ b/net-misc/twonkymedia/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+       <maintainer> 
+               <email>mario.fetka@gmail.com</email>
+               <name>Mario Fetka</name>
+       </maintainer>
+</pkgmetadata>
diff --git a/net-misc/twonkymedia/twonkymedia-6.0.38.ebuild b/net-misc/twonkymedia/twonkymedia-6.0.38.ebuild
new file mode 100644
index 0000000..ce68bc8
--- /dev/null
+++ b/net-misc/twonkymedia/twonkymedia-6.0.38.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils multilib
+
+SUFFIX="zip"
+X86_AT="twonkymedia-i386-glibc-2.2.5-${PV}.${SUFFIX}"
+AMD64_AT="twonkymedia-i386-glibc-2.2.5-${PV}.${SUFFIX}"
+ARMV5_AT="twonkymedia-kirkwood-${PV}.${SUFFIX}"
+# not tested on armv6
+ARMV6_AT="twonkymedia-armel-glibc-2.2.5-${PV}.${SUFFIX}"
+ARMV7_AT="twonkymedia-armel-glibc-2.2.5-${PV}.${SUFFIX}"
+
+DESCRIPTION="Stream your Media to the devices on your Netowrk"
+HOMEPAGE="http://www.twonky.com/"
+URL_BASE="http://www.twonkyforum.com/downloads/${PV}"
+SRC_URI="arm? ( ${URL_BASE}/${ARMV5_AT}
+		${URL_BASE}/${ARMV6_AT}
+		${URL_BASE}/${ARMV7_AT} )
+	x86? ( ${URL_BASE}/${X86_AT} )
+	amd64? ( ${URL_BASE}/${X86_AT} )"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~amd64 ~arm ~x86"
+RESTRICT="strip"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND="sys-libs/glibc
+	sys-devel/gcc"
+
+QA_EXECSTACK="opt/twonkymedia/cgi-bin/convert
+	opt/twonkymedia/cgi-bin/cgi-jpegscale
+	opt/twonkymedia/twonkymediaserver
+	opt/twonkymedia/twonkymedia
+	opt/twonkymedia/plugins/mediafusion-integration-plugin
+	opt/twonkymedia/plugins/itunes-import"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	einfo "Unpacking for arch ${CHOST/-*/}"
+
+	if [[ ${CHOST/-*/} = "armv5tel" ]]; then
+		unpack ${ARMV5_AT}
+	elif [[ ${CHOST/-*/} = "armv6j" ]]; then
+		unpack ${ARMV6_AT}
+	elif [[ ${CHOST/-*/} = "armv7a" ]]; then
+		unpack ${ARMV7_AT}
+	elif [[ ${ARCH} = "x86" ]]; then
+		unpack ${X86_AT}
+	elif [[ ${ARCH} = "amd64" ]]; then
+		unpack ${X86_AT}
+	fi
+}
+
+src_compile() { :; }
+
+src_install() {
+	local dirs="cgi-bin plugins resources"
+
+	dodir /opt/${PN}
+
+	cp -pPR $dirs "${D}/opt/${PN}/" || die "failed to copy"
+
+	insinto /opt/${PN}
+	doins initial_keystore.dat radio.m3u config.html twonkymedia-server-default.ini
+
+	exeinto /opt/${PN}
+	doexe twonkymedia twonkymediaserver
+
+	dodoc Linux-HowTo.txt RevisionHistory || die
+
+	newinitd "${FILESDIR}"/twonkymedia.initd twonkymedia
+}
+
+#pkg_postinst() {
+#}