diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix
index abcdc5d330c7..1bfb2df2745c 100644
--- a/pkgs/applications/audio/cmus/default.nix
+++ b/pkgs/applications/audio/cmus/default.nix
@@ -1,20 +1,21 @@
 { stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, ffmpeg, libvorbis, mpc, mp4v2 }:
 
 stdenv.mkDerivation rec {
-  name = "cmus-2.3.3";
+  name = "cmus-${version}";
+  version = "2.3.3";
 
   configurePhase = "./configure prefix=$out";
 
   buildInputs = [ ncurses pkgconfig alsaLib flac libmad ffmpeg libvorbis mpc mp4v2 ];
 
   src = fetchurl {
-    url = mirror://sourceforge/cmus/cmus-v2.3.3.tar.bz2;
-    md5 = "220e875e4210a6b54882114ef7094a79";
+    url = "mirror://sourceforge/cmus/cmus-v${version}.tar.bz2";
+    sha256 = "13hc5d7h2ayjwnip345hc59rpjj9fgrp1i5spjw3s14prdqr733v";
   };
 
   meta = {
     description = "cmus is a small, fast and powerful console music player for Linux and *BSD";
     homepage = http://cmus.sourceforge.net;
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d014f1c7f16c..7c8449049f64 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5248,8 +5248,6 @@ let
 
   amarok = newScope pkgs.kde4 ../applications/audio/amarok { };
 
-  cmus = callPackage ../applications/audio/cmus { };
-
   amsn = callPackage ../applications/networking/instant-messengers/amsn {
     libstdcpp = gcc33.gcc;
   };
@@ -5382,6 +5380,8 @@ let
     inherit (gnome) esound;
   };
 
+  cmus = callPackage ../applications/audio/cmus { };
+
   compiz = callPackage ../applications/window-managers/compiz/core.nix { };
 
   compiz_ccsm = callPackage ../applications/window-managers/compiz/ccsm.nix { };