Index: make/umurmur/Config.in
===================================================================
--- make/umurmur/Config.in	(revision 1)
+++ make/umurmur/Config.in	(revision 1)
@@ -0,0 +1,16 @@
+config FREETZ_PACKAGE_UMURMUR
+	bool "umurmur 0.2.2 (binary only)"
+	select FREETZ_LIB_libconfig
+	select FREETZ_LIB_libpolarssl
+	default n
+	help
+		umurmur is a minimalistic Mumble server primarily
+		targeted to run on routers using less resources.
+		It targets to fill the needs of a pretty small group
+		of users communicating, which in part originates from
+		the other goal of working well on a small system with
+		a limited CPU and limited amount of disk space. It also
+		aims to minimize writing to the disk since these kinds
+		of systems usually only has a flash memory for disk.
+		umurmur supports a subset of the features of Murmur.
+		http://code.google.com/p/umurmur/
Index: make/umurmur/external.in
===================================================================
--- make/umurmur/external.in	(revision 0)
+++ make/umurmur/external.in	(revision 0)
@@ -0,0 +1,7 @@
+ config EXTERNAL_FREETZ_PACKAGE_UMURMUR
+	depends on EXTERNAL_ENABLED && FREETZ_PACKAGE_UMURMUR
+	bool "umurmur"
+	default n
+	help
+		externals these file(s):
+			/usr/bin/umurmurd
Index: make/umurmur/Makefile.in
===================================================================
--- make/umurmur/Makefile.in	(revision 0)
+++ make/umurmur/Makefile.in	(revision 0)
@@ -0,0 +1,3 @@
+ifeq ($(strip $(FREETZ_PACKAGE_UMURMUR)),y)
+PACKAGES+=umurmur
+endif
Index: make/umurmur/patches/110_Mumble_pb-c_h.patch
===================================================================
--- make/umurmur/patches/110_Mumble_pb-c_h.patch	(revision 0)
+++ make/umurmur/patches/110_Mumble_pb-c_h.patch	(revision 0)
@@ -0,0 +1,11 @@
+--- src/Mumble.pb-c.h.orig	2010-03-08 08:45:12.000000000 +0100
++++ src/Mumble.pb-c.h		2010-03-08 08:41:06.000000000 +0100
+@@ -3,7 +3,7 @@
+ #ifndef PROTOBUF_C_Mumble_2eproto__INCLUDED
+ #define PROTOBUF_C_Mumble_2eproto__INCLUDED
+ 
+-#include <google/protobuf-c/protobuf-c.h>
++#include "google/protobuf-c/protobuf-c.h"
+ 
+ PROTOBUF_C_BEGIN_DECLS
+ 
Index: make/umurmur/umurmur.mk
===================================================================
--- make/umurmur/umurmur.mk	(revision 1)
+++ make/umurmur/umurmur.mk	(revision 1)
@@ -0,0 +1,39 @@
+$(call PKG_INIT_BIN, 0.2.2)
+$(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.gz
+$(PKG)_SITE:=http://$(pkg).googlecode.com/files
+$(PKG)_BINARY:=$($(PKG)_DIR)/src/$(pkg)d
+$(PKG)_TARGET_BINARY:=$($(PKG)_DEST_DIR)/usr/bin/$(pkg)d
+$(PKG)_SOURCE_MD5:=a841cf38de7fbc8bdacafbd481561da7
+
+$(PKG)_DEPENDS_ON := polarssl libconfig
+
+POLARSSL_LIB:=$(FREETZ_BASE_DIR)/source/$(pkg)-$($(PKG)_VERSION)/library/libpolarssl.a
+POLARSSL_INCLUDE:=$(TARGET_TOOLCHAIN_STAGING_DIR)/include/polarssl/
+EXTRA_CFLAGS:=-DUSE_POLARSSL -I$(POLARSSL_INCLUDE)
+EXTRA_LDLAGS:=-lpolarssl -lconfig
+
+$(PKG_SOURCE_DOWNLOAD)
+$(PKG_UNPACKED)
+$(PKG_CONFIGURED_NOP)
+
+$($(PKG)_BINARY): $($(PKG)_DIR)/.configured
+	$(SUBMAKE) -C $(UMURMUR_DIR)/src \
+	CC="$(TARGET_CC)" \
+	CFLAGS="$(EXTRA_CFLAGS) $(TARGET_CFLAGS)" \
+	LDFLAGS="$(EXTRA_LDLAGS)"
+
+$($(PKG)_TARGET_BINARY): $($(PKG)_BINARY)
+	$(INSTALL_BINARY_STRIP)
+
+$(pkg):
+
+$(pkg)-precompiled: $($(PKG)_TARGET_BINARY)
+
+$(pkg)-clean:
+	-$(SUBMAKE) -C $(UMURMUR_DIR) clean
+	$(RM) $(UMURMUR_DIR)/.configured
+
+$(pkg)-uninstall:
+	$(RM) $UMURMUR_TARGET_BINARY)
+
+$(PKG_FINISH)
Index: make/umurmur/files/root/etc/default.umurmur/sample-umurmur.conf
===================================================================
--- make/umurmur/files/root/etc/default.umurmur/sample-umurmur.conf	(revision 0)
+++ make/umurmur/files/root/etc/default.umurmur/sample-umurmur.conf	(revision 0)
@@ -0,0 +1,42 @@
+max_bandwidth = 48000;
+welcometext = "Welcome to uMurmur!";
+certificate = "/etc/umurmur/cert.crt";
+private_key = "/etc/umurmur/key.key";
+password = "";
+max_users = 10;
+
+# 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";
+	 },
+	 {
+	 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";
Index: make/umurmur/files/root/etc/umurmur/dummy
===================================================================
--- make/umurmur/files/root/etc/umurmur/dummy	(revision 0)
+++ make/umurmur/files/root/etc/umurmur/dummy	(revision 0)
@@ -0,0 +1 @@
+ 
Index: make/external.in
===================================================================
--- make/external.in		(revision 4433)
+++ make/external.in		(working copy)
@@ -54,6 +54,7 @@
 source make/transmission/external.in
 source make/tree/external.in
 source make/trickle/external.in
+source make/umurmur/external.in
 source make/unrar/external.in
 source make/vim/external.in
 source make/wol/external.in
Index: make/Config.in
===================================================================
--- make/Config.in		(revision 4433)
+++ make/Config.in		(working copy)
@@ -163,6 +163,7 @@
 source make/tree/Config.in
 source make/trickle/Config.in
 source make/tmux/Config.in
+source make/umurmur/Config.in
 source make/unrar/Config.in
 source make/usbroot/Config.in
 source make/vim/Config.in
Index: tools/external
===================================================================
--- tools/external		(revision 4433)
+++ tools/external		(working copy)
@@ -211,6 +211,7 @@
 [ "$EXTERNAL_FREETZ_PACKAGE_TRANSMISSION_WEBINTERFACE" == "y" ] && EXTERNAL_FILES+=" /usr/share/transmission-web-home"
 [ "$EXTERNAL_FREETZ_PACKAGE_TREE" == "y" ] && EXTERNAL_FILES+=" /usr/bin/tree"
 [ "$EXTERNAL_FREETZ_PACKAGE_TRICKLE" == "y" ] && EXTERNAL_FILES+=" /usr/bin/trickle /usr/bin/trickled /usr/bin/tricklectl /usr/lib/freetz/trickle-overload.so"
+[ "$EXTERNAL_FREETZ_PACKAGE_UMURMUR" == "y" ] && EXTERNAL_FILES+=" /usr/bin/umurmurd"
 [ "$EXTERNAL_FREETZ_PACKAGE_UNRAR" == "y" ] && EXTERNAL_FILES+=" /usr/bin/unrar"
 [ "$EXTERNAL_FREETZ_PACKAGE_VIM" == "y" ] && EXTERNAL_FILES+=" /usr/bin/vim"
 [ "$EXTERNAL_FREETZ_PACKAGE_VSFTPD" == "y" ] && EXTERNAL_FILES+=" /usr/sbin/vsftpd"