diff --git a/net-misc/ps3mediaserver/Manifest b/net-misc/ps3mediaserver/Manifest
index 67cd664..3fb1bb3 100644
--- a/net-misc/ps3mediaserver/Manifest
+++ b/net-misc/ps3mediaserver/Manifest
@@ -1,2 +1,4 @@
 DIST pms-generic-linux-unix-1.22.0.tgz 10603913 RMD160 e063dfa79d4fc160101263fff6fa48448f6e2229 SHA1 80b68731b21a4fe782c6ab31911f03bfc9b5c00c SHA256 b8261addd026770ce52509d7d79d409ae45cf7b7ba17e77b134bc45eeb69a5d2
+DIST pms-generic-linux-unix-1.25.1.tgz 10619276 RMD160 4bf021c56e5afcea7be122e90b618f1959283ad9 SHA1 8788599d4ea73d1340b2557262b354ae8299c55c SHA256 642ab60b2110a33c357926806b048eec7d0af240c14ddbb425b4aa75ec4a1136
 EBUILD ps3mediaserver-1.22.0.ebuild 1407 RMD160 1163b63dca9218c811296d9c61b21e2d71f71606 SHA1 4eab383ddd250c8bf015ca388b07a774b721b1b3 SHA256 ce168534764353897f1fc1ba84f533d5b44cc16edb93f39a52b61ff23baaacb2
+EBUILD ps3mediaserver-1.25.1.ebuild 1407 RMD160 1163b63dca9218c811296d9c61b21e2d71f71606 SHA1 4eab383ddd250c8bf015ca388b07a774b721b1b3 SHA256 ce168534764353897f1fc1ba84f533d5b44cc16edb93f39a52b61ff23baaacb2
diff --git a/net-misc/ps3mediaserver/ps3mediaserver-1.25.1.ebuild b/net-misc/ps3mediaserver/ps3mediaserver-1.25.1.ebuild
new file mode 100644
index 0000000..bd9350c
--- /dev/null
+++ b/net-misc/ps3mediaserver/ps3mediaserver-1.25.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ps3mediaserver/ps3mediaserver-1.20.412-r1.ebuild,v 1.1 2011/01/07 17:03:11 vapier Exp $
+
+EAPI="2"
+
+DESCRIPTION="DLNA compliant UPNP server for streaming media to Playstation 3"
+HOMEPAGE="http://code.google.com/p/ps3mediaserver"
+SRC_URI="http://ps3mediaserver.googlecode.com/files/pms-generic-linux-unix-${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+transcode tsmuxer"
+
+DEPEND=""
+RDEPEND=">=virtual/jre-1.6.0
+	tsmuxer? ( media-video/tsmuxer )
+	transcode? ( media-video/mplayer[encode] )"
+
+S=${WORKDIR}/pms-linux-${PV}
+
+src_prepare() {
+	rm linux/tsMuxeR* || die
+	cat <<-EOF > ${PN}
+	#!/bin/sh
+	echo "Setting up ~/.${PN} based on /usr/share/${PN}/"
+	if [ ! -e ~/.${PN} ] ; then
+		mkdir -p ~/.${PN}
+		cp -pPR /usr/share/${PN}/* ~/.${PN}/
+	fi
+	cd ~/.${PN}
+	PMS_HOME=\$PWD
+	EOF
+	cat PMS.sh >> ${PN}
+}
+
+src_install() {
+	dobin ${PN} || die
+	insinto /usr/share/${PN}
+	doins -r pms.jar *.conf linux plugins renderers || die
+	use tsmuxer && { dosym /opt/bin/tsMuxeR /usr/share/${PN}/linux/ || die ; }
+	dodoc CHANGELOG FAQ README
+}
+
+pkg_postinst() {
+	ewarn "Don't forget to disable transcoding engines for software"
+	ewarn "that you don't have installed (such as having the VLC"
+	ewarn "transcoding engine enabled when you only have mencoder)."
+}