diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
new file mode 100644
index 00000000000..d12614e0c08
--- /dev/null
+++ b/pkgs/tools/audio/beets/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, buildPythonPackage, pythonPackages, python }:
+
+buildPythonPackage rec {
+  name = "beets-1.3.6";
+  namePrefix = "";
+
+  src = fetchurl {
+    url = "http://pypi.python.org/packages/source/b/beets/${name}.tar.gz";
+    md5 = "59615a54b3ac3983159e77ff9dda373e";
+  };
+
+  # tests depend on $HOME setting
+  preConfigure = "export HOME=$TMPDIR";
+
+  propagatedBuildInputs = [
+    pythonPackages.pyyaml
+    pythonPackages.unidecode
+    pythonPackages.mutagen
+    pythonPackages.munkres
+    pythonPackages.musicbrainzngs
+    pythonPackages.enum34
+    pythonPackages.pylast
+    pythonPackages.rarfile
+    pythonPackages.flask
+    python.modules.sqlite3
+    python.modules.readline
+  ];
+
+  buildInputs = with pythonPackages; [ mock pyechonest six responses nose ];
+
+  # 10 tests are failing
+  doCheck = false;
+
+  meta = {
+    homepage = http://beets.radbox.org;
+    description = "Music tagger and library organizer";
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.iElectric ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d060ee1d378..55abdb8eea8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -757,6 +757,8 @@ let
 
   beanstalkd = callPackage ../servers/beanstalkd { };
 
+  beets = callPackage ../tools/audio/beets { };
+
   bgs = callPackage ../tools/X11/bgs { };
 
   biber = callPackage ../tools/typesetting/biber {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ffd81c232a3..172643e12d4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -789,44 +789,6 @@ let
     };
   };
 
-  beets = buildPythonPackage rec {
-    name = "beets-1.3.6";
-
-    src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/b/beets/${name}.tar.gz";
-      md5 = "59615a54b3ac3983159e77ff9dda373e";
-    };
-
-    # tests depend on $HOME setting
-    preConfigure = "export HOME=$TMPDIR";
-
-    propagatedBuildInputs =
-      [ self.pyyaml
-        self.unidecode
-        self.mutagen
-        self.munkres
-        self.musicbrainzngs
-        self.enum34
-        self.pylast
-        self.rarfile
-        self.flask
-        modules.sqlite3
-        modules.readline
-      ];
-
-    buildInputs = with self; [ mock pyechonest six responses nose ];
-
-    # 10 tests are failing
-    doCheck = false;
-
-    meta = {
-      homepage = http://beets.radbox.org;
-      description = "Music tagger and library organizer";
-      license = licenses.mit;
-      maintainers = [ stdenv.lib.maintainers.iElectric ];
-    };
-  };
-
   circus = buildPythonPackage rec {
     name = "circus-0.11.1";