diff --git a/pkgs/tools/audio/mpdcron/default.nix b/pkgs/tools/audio/mpdcron/default.nix
new file mode 100644
index 00000000000..61553566d6c
--- /dev/null
+++ b/pkgs/tools/audio/mpdcron/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchgit, autoconf, automake, libtool, pkgconfig, glib, libdaemon
+, mpd_clientlib, curl, sqlite, ruby, rubyLibs, libnotify }:
+
+stdenv.mkDerivation rec {
+  version = "20130809";
+  name    = "mpdcron-${version}";
+
+  src = fetchgit {
+    url    = https://github.com/alip/mpdcron.git;
+    rev    = "1dd16181c32f33e7754bbe21841c8e70b28f8ecd";
+    sha256 = "1h3n433jn9yg74i218pkxzrngsjpnf0z02lakfldl6j1s9di2pn3";
+  };
+
+  meta = {
+    description = "A cron like daemon for mpd.";
+    homepage    = http://alip.github.io/mpdcron/;
+    license     = stdenv.lib.licenses.gpl2;
+    platforms   = with stdenv.lib.platforms; unix;
+    maintainers = [ stdenv.lib.maintainers.lovek323 ];
+  };
+
+  buildInputs =
+    [ autoconf automake libtool pkgconfig glib libdaemon
+      mpd_clientlib curl sqlite ruby rubyLibs.nokogiri libnotify ];
+
+  preConfigure = ''
+    ./autogen.sh
+  '';
+
+  configureFlags = [ "--enable-gmodule" "--with-standard-modules=all" ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b13d0c47d69..681b369a43d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -632,6 +632,8 @@ let
 
   mcrl2 = callPackage ../tools/misc/mcrl2 { };
 
+  mpdcron = callPackage ../tools/audio/mpdcron { };
+
   syslogng = callPackage ../tools/system/syslog-ng { };
 
   rsyslog = callPackage ../tools/system/rsyslog { };
@@ -6606,7 +6608,10 @@ let
 
   mod_wsgi = callPackage ../servers/http/apache-modules/mod_wsgi { };
 
-  mpd = callPackage ../servers/mpd { };
+  mpd = callPackage ../servers/mpd {
+    aacSupport    = config.mpd.aacSupport or true;
+    ffmpegSupport = config.mpd.ffmpegSupport or true;
+  };
 
   mpd_clientlib = callPackage ../servers/mpd/clientlib.nix { };