diff --git a/pkgs/servers/mediatomb/default.nix b/pkgs/servers/mediatomb/default.nix
index d88e1dd9e141..4d3ef231af3f 100644
--- a/pkgs/servers/mediatomb/default.nix
+++ b/pkgs/servers/mediatomb/default.nix
@@ -1,28 +1,27 @@
-{ stdenv, fetchurl
-, sqlite, expat, spidermonkey, taglib, libexif, curl, ffmpeg, file }:
+{ stdenv, fetchgit
+, sqlite, expat, mp4v2, flac, spidermonkey, taglib, libexif, curl, ffmpeg, file
+, pkgconfig, autoreconfHook }:
 
 stdenv.mkDerivation rec {
 
   name = "mediatomb-${version}";
   version = "0.12.1";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/mediatomb/${name}.tar.gz";
-    sha256 = "1k8i5zvgik7cad7znd8358grzwh62frpqww1a5rwkldrlws3q5ii";
+  src = fetchgit {
+    url = meta.repositories.git;
+    rev = "7ab761696354868bd5d67ff4f2d849994e4c98e2";
+    sha256 = "7b51d488ac0b93c7720f8f8373970884a55b0879b1f6941873e916f41177d062";
   };
 
-  patches = [ ./zmm_new.patch ];
-
-  buildInputs = [ sqlite expat spidermonkey taglib libexif curl ffmpeg file ];
-
-  configureFlags = [ "--enable-inotify" ];
+  buildInputs = [ sqlite expat spidermonkey taglib libexif curl ffmpeg file mp4v2 flac
+                  pkgconfig autoreconfHook ];
 
   meta = with stdenv.lib; {
     homepage = http://mediatomb.cc;
+    repositories.git = git://mediatomb.git.sourceforge.net/gitroot/mediatomb/mediatomb;
     description = "UPnP MediaServer with a web user interface";
     license = licenses.gpl2;
     maintainers = [ maintainers.phreedom ];
     platforms = platforms.linux;
-    broken = true;
   };
 }
diff --git a/pkgs/servers/mediatomb/zmm_new.patch b/pkgs/servers/mediatomb/zmm_new.patch
deleted file mode 100644
index 5238b42035bf..000000000000
--- a/pkgs/servers/mediatomb/zmm_new.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -rc mediatomb-0.12.1.old/src/zmm/object.h mediatomb-0.12.1/src/zmm/object.h
-*** mediatomb-0.12.1.old/src/zmm/object.h	2010-03-25 07:58:08.000000000 -0700
---- mediatomb-0.12.1/src/zmm/object.h	2013-02-15 17:57:02.000000000 -0800
-***************
-*** 33,38 ****
---- 33,39 ----
-  #define __ZMM_OBJECT_H__
-  
-  #include <new> // for size_t
-+ #include <stddef.h>
-  #include "atomic.h"
-  
-  namespace zmm
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index be2631831d10..48f9d2298018 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7388,7 +7388,9 @@ let
 
   mailman = callPackage ../servers/mail/mailman { };
 
-  mediatomb = callPackage ../servers/mediatomb { };
+  mediatomb = callPackage ../servers/mediatomb {
+    spidermonkey = spidermonkey_185;
+  };
 
   memcached = callPackage ../servers/memcached {};