diff --git a/media-sound/umurmur/Manifest b/media-sound/umurmur/Manifest
new file mode 100644
index 0000000000000000000000000000000000000000..127091804822b863a82b6b62be7462242256fa19
--- /dev/null
+++ b/media-sound/umurmur/Manifest
@@ -0,0 +1,6 @@
+AUX umurmur-polarssl-1.1.1.patch 604 RMD160 f37b6ec54de4b8c907083d752fb33337a6c7be19 SHA1 6fb475f91b8360f6b3fe79fc560303ea3e2fb04f SHA256 5312bc3136da0b097f6b8a840e9e472f6476605a5c2ca962ab398e4ca80092f8
+AUX umurmur.conf 1639 RMD160 5dd94d9f8358b65afb2187dca1cd060d8ff0afb8 SHA1 8134cea75f16a01d10f64be03e334f570b78869f SHA256 32ee6824594e16e5f20c8b08923a517063a54cbdf5116caa6f76f4098be97442
+AUX umurmurd.confd 185 RMD160 877c8d10f263317b17b47f52592568ab20d99a48 SHA1 f7b21d7f094fbe7b541cdd0a143cf27019a290e5 SHA256 ed2d207e2ec5f3df61b9d28827e59513c7d3a72b891488206a59c4d7a571893e
+AUX umurmurd.initd 475 RMD160 de59bf25897e09c54f2ec4554c0f501a95607b48 SHA1 5b9fde01b6f3ceff74a3b00c3f5671f2f3cc84ce SHA256 5e53c46069a3473eb5cb849c3dea5e4beb36b7ef742b10022bf7dc7bff3c72ce
+DIST umurmur-0.2.10.tar.gz 161937 RMD160 9967ab086832d9da7ff68b740fef1ea567ca6923 SHA1 5a53b021078dfbdf001c9af9ff207ea84bcf8222 SHA256 7e4f962a04f2a683b5f855726c059c504f6b2ee09fe290a5a2468d53b7042931
+EBUILD umurmur-0.2.10.ebuild 2045 RMD160 a04f0e04f963bc733ad7348289d0c803436f37ad SHA1 72c7f7dead2bc1827cf8412aaf62692f065d7922 SHA256 7b85b795f51ec452554ddb1c6c2c9fb7d8da4c1fd7fabd7a6b31c23bc82b7d8c
diff --git a/media-sound/umurmur/files/umurmur-polarssl-1.1.1.patch b/media-sound/umurmur/files/umurmur-polarssl-1.1.1.patch
new file mode 100644
index 0000000000000000000000000000000000000000..8bac405d5c7f1484b16eee6d066e77f34b87152a
--- /dev/null
+++ b/media-sound/umurmur/files/umurmur-polarssl-1.1.1.patch
@@ -0,0 +1,27 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+inherit autotools autotools-utils
+
+DESCRIPTION="C bindings for Google's Protocol Buffers"
+HOMEPAGE="http://protobuf-c.googlecode.com/"
+SRC_URI="${HOMEPAGE}/files/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+DEPEND="dev-libs/protobuf"
+
+RDEPEND="${DEPEND}"
+
+# Sometimes compilation fails due to truncated source file which seems to be a
+# parallel make issue involving the generated code
+src_compile() {
+	autotools-utils_src_compile -j1
+}
+
diff --git a/media-sound/umurmur/files/umurmur.conf b/media-sound/umurmur/files/umurmur.conf
new file mode 100644
index 0000000000000000000000000000000000000000..dc8c222dfd4cb77627dd430fd37d2518c0a439af
--- /dev/null
+++ b/media-sound/umurmur/files/umurmur.conf
@@ -0,0 +1,58 @@
+# This configuration is based on the official example configuration. More information can be found
+# at http://code.google.com/p/umurmur/wiki/Configuring02x
+
+max_bandwidth = 48000;
+welcometext = "Welcome to uMurmur!";
+certificate = "/etc/umurmur/cert.crt";
+private_key = "/etc/umurmur/key.key";
+password = "";
+max_users = 10;
+
+# Specify port and/or address to bind to. Typically not needed.
+# Default is '*' for address and 64738 for port. 
+# Can also be specified on the command line, which takes precedence if
+# both are specified.
+# bindport = 64738;
+# bindaddr = "192.168.1.1";
+
+# Specify this for privilege dropping. If username is specified but not 
+# the groupname, the user's login group is used.
+username = "umurmur";
+groupname = "umurmur";
+
+# Root channel must always be defined first.
+# If a channel has a parent, the parent must be defined before the child channel(s).
+channels = ( {
+         name = "Root";
+         parent = "";
+         description = "The Root of all channels";
+         noenter = true;
+         },
+         {
+         name = "Lobby";
+         parent = "Root";
+         description = "Lobby channel";
+         },
+         {
+         name = "Red team";
+         parent = "Lobby";
+         description = "The Red team channel";
+         },
+         {
+         name = "Blue team";
+         parent = "Lobby";
+         description = "The Blue team channel";
+         }
+);
+# Channel links configuration.
+channel_links = ( {
+         source = "Lobby";
+         destination = "Red team";
+         },
+         {
+         source = "Lobby";
+         destination = "Blue team";
+         }
+);
+
+default_channel = "Lobby";
diff --git a/media-sound/umurmur/files/umurmurd.confd b/media-sound/umurmur/files/umurmurd.confd
new file mode 100644
index 0000000000000000000000000000000000000000..8365800357c2b06ab25144f3539aaa1fb07db8ff
--- /dev/null
+++ b/media-sound/umurmur/files/umurmurd.confd
@@ -0,0 +1,9 @@
+# Path to configuration file
+UMURMURD_CONF="/etc/umurmur.conf"
+
+# Path to PID file
+UMURMURD_PID="/var/run/umurmurd.pid"
+
+# Additional flags to be passed to umurmurd
+UMURMURD_OPTS="-r"
+
diff --git a/media-sound/umurmur/files/umurmurd.initd b/media-sound/umurmur/files/umurmurd.initd
new file mode 100644
index 0000000000000000000000000000000000000000..1db3e52643eae49e232d27f0be7445b6b24c06e7
--- /dev/null
+++ b/media-sound/umurmur/files/umurmurd.initd
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+depend() {
+	need net
+	use logger
+}
+
+start() {
+	ebegin "Starting umurmurd"
+	start-stop-daemon --start --exec /usr/bin/umurmurd --pidfile "${UMURMURD_PID}" -- \
+		-c "${UMURMURD_CONF}" -p "${UMURMURD_PID}" ${UMURMURD_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping umurmurd"
+	start-stop-daemon --stop --pidfile "${UMURMURD_PID}"
+	eend $?
+}
+
diff --git a/media-sound/umurmur/umurmur-0.2.10.ebuild b/media-sound/umurmur/umurmur-0.2.10.ebuild
new file mode 100644
index 0000000000000000000000000000000000000000..0adfba89625b429b55a6aae638514cad7fa358e8
--- /dev/null
+++ b/media-sound/umurmur/umurmur-0.2.10.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+inherit eutils
+
+DESCRIPTION="Minimalistic Murmur (Mumble server)"
+HOMEPAGE="http://code.google.com/p/umurmur/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="BSD-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="polarssl"
+
+DEPEND="dev-libs/protobuf-c
+	dev-libs/libconfig
+	polarssl? ( >=net-libs/polarssl-1.1 )
+	!polarssl? ( dev-libs/openssl )"
+
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup umurmur || die
+	enewuser umurmur "" "" "" umurmur || die
+}
+
+src_configure() {
+	local myconf
+
+	# build uses polarssl by default, but instead, make it use openssl unless
+	# polarssl is desired.
+	use !polarssl && myconf="${myconf} --with-ssl=openssl"
+
+	econf ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+
+	newinitd "${FILESDIR}/umurmurd.initd" umurmurd || die
+	newconfd "${FILESDIR}/umurmurd.confd" umurmurd || die
+
+	dodoc AUTHORS ChangeLog || die "dodoc failed"
+	newdoc README.md README || die "newdoc failed"
+
+	# Some permissions are adjusted as the config may contain a server
+	# password, and /etc/umurmur will typically contain the cert and the key
+	# used to sign it, which are read after priveleges are dropped.
+	insinto /etc
+	doins "${FILESDIR}/umurmur.conf" || die
+	fperms 0640 /etc/umurmur.conf || die
+
+	dodir /etc/umurmur || die
+	fperms 0750 /etc/umurmur || die
+	fowners root:umurmur /etc/umurmur || die
+}
+
+pkg_postinst() {
+	elog "A configuration file has been installed at /etc/umurmur.conf - you may "
+	elog "want to review it. See also http://code.google.com/p/umurmur/wiki/Configuring02x"
+
+	if use polarssl ; then
+		elog
+		elog "Because you have enabled PolarSSL support, umurmurd will use a"
+		elog "predefined test-certificate and key if none are configured, which"
+		elog "is insecure. See http://code.google.com/p/umurmur/wiki/Installing02x#Installing_uMurmur_with_PolarSSL_support"
+		elog "for more information on how to create your certificate and key"
+	fi
+}