diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix
index bbbe54b95fd9..41e3b547f70e 100644
--- a/pkgs/servers/mpd/clientlib.nix
+++ b/pkgs/servers/mpd/clientlib.nix
@@ -6,21 +6,21 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://www.musicpd.org/download/libmpdclient/2/${name}.tar.xz";
-    sha256 = "1jlrfqxqq3gscwrppr2h0xqxd5abl1ypwpwpwnpxs6p9c2jppjbw";
+    sha256 = "10pzs9z815a8hgbbbiliapyiw82bnplsccj5irgqjw5f5plcs22g";
   };
 
   buildInputs = [ doxygen ];
 
   passthru = {
     majorVersion = "2";
-    minorVersion = "9";
+    minorVersion = "10";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Client library for MPD (music player daemon)";
-    homepage = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki;
-    license = stdenv.lib.licenses.gpl2;
-    platforms = with stdenv.lib.platforms; unix;
-    maintainers = [ stdenv.lib.maintainers.mornfall ];
+    homepage = http://www.musicpd.org/libs/libmpdclient/;
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ mornfall emery ];
   };
 }
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index 0078b4af96ff..36b78388980e 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -21,6 +21,8 @@
 , jackSupport ? true, jack2
 , gmeSupport ? true, game-music-emu
 , icuSupport ? true, icu
+, clientSupport ? false, mpd_clientlib
+, opusSupport ? true, libopus
 }:
 
 let
@@ -32,8 +34,8 @@ let
 in stdenv.mkDerivation rec {
   name = "mpd-${major}.${minor}";
   src = fetchurl {
-    url    = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.gz";
-    sha256 = "1j3cv8b76bfj3ddpd29v3apb5025i87y5h5b4lrs2g5vqsgpvb6y";
+    url    = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.xz";
+    sha256 = "0vzj365s4j0pw5w37lfhx3dmpkdp85driravsvx8rlrw0lii91a7";
   };
 
   buildInputs = [ pkgconfig glib boost ]
@@ -61,7 +63,9 @@ in stdenv.mkDerivation rec {
     ++ opt pulseaudioSupport pulseaudio
     ++ opt jackSupport jack2
     ++ opt gmeSupport game-music-emu
-    ++ opt icuSupport icu;
+    ++ opt icuSupport icu
+    ++ opt clientSupport mpd_clientlib
+    ++ opt opusSupport libopus;
 
   configureFlags =
     [ (mkFlag (!stdenv.isDarwin && alsaSupport) "alsa")
@@ -88,6 +92,8 @@ in stdenv.mkDerivation rec {
       (mkFlag stdenv.isDarwin "osx")
       (mkFlag icuSupport "icu")
       (mkFlag gmeSupport "gme")
+      (mkFlag clientSupport "libmpdclient")
+      (mkFlag opusSupport "opus")
       "--enable-debug"
     ]
     ++ opt stdenv.isLinux
@@ -101,7 +107,7 @@ in stdenv.mkDerivation rec {
     description = "A flexible, powerful daemon for playing music";
     homepage    = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki;
     license     = licenses.gpl2;
-    maintainers = with maintainers; [ astsmtl fuuzetsu ];
+    maintainers = with maintainers; [ astsmtl fuuzetsu emery ];
     platforms   = platforms.unix;
 
     longDescription = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c9c06d1c1d7d..4aa233f873c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8373,7 +8373,10 @@ let
 
   mpd = callPackage ../servers/mpd {
     aacSupport    = config.mpd.aacSupport or true;
+    clientSupport = config.mpd.clientSupport or false;
     ffmpegSupport = config.mpd.ffmpegSupport or true;
+    opusSupport   = config.mpd.opusSupport or true;
+
   };
 
   mpd_clientlib = callPackage ../servers/mpd/clientlib.nix { };
@@ -10268,7 +10271,7 @@ let
   };
 
   dbvisualizer = callPackage ../applications/misc/dbvisualizer {};
-  
+
   dd-agent = callPackage ../tools/networking/dd-agent { inherit (pythonPackages) tornado; };
 
   deadbeef = callPackage ../applications/audio/deadbeef {