diff --git a/pkgs/development/python-modules/guessit/default.nix b/pkgs/development/python-modules/guessit/default.nix
new file mode 100644
index 000000000000..7cf051b89a6d
--- /dev/null
+++ b/pkgs/development/python-modules/guessit/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytestrunner
+, dateutil
+, babelfish
+, rebulk
+}:
+
+buildPythonPackage rec {
+  pname = "guessit";
+  version = "2.1.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "9f7e12b7f2215548284631a20aae6fc009c8af2bb8cc5d5e5e339cb15361dd95";
+  };
+
+  # Tests require more packages.
+  doCheck = false;
+  buildInputs = [ pytestrunner ];
+  propagatedBuildInputs = [
+    dateutil babelfish rebulk
+  ];
+
+  meta = {
+    homepage = http://pypi.python.org/pypi/guessit;
+    license = lib.licenses.lgpl3;
+    description = "A library for guessing information from video files";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 979e089bdbae..8029982420b0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12615,29 +12615,7 @@ in {
     };
   };
 
-  guessit = buildPythonPackage rec {
-    version = "2.0.4";
-    name = "guessit-${version}";
-    disabled = isPy3k;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/g/guessit/${name}.tar.gz";
-      sha256 = "4f72e21fca9c294651abee26554e2ad778220d90a84f6e1195299a7ec17accb1";
-    };
-
-    # Tests require more packages.
-    doCheck = false;
-    buildInputs = with self; [ pytestrunner ];
-    propagatedBuildInputs = with self; [
-      dateutil babelfish rebulk
-    ];
-
-    meta = {
-      homepage = http://pypi.python.org/pypi/guessit;
-      license = licenses.lgpl3;
-      description = "A library for guessing information from video files";
-    };
-  };
+  guessit = callPackage ../development/python-modules/guessit { };
 
   rebulk = buildPythonPackage rec {
     version = "0.8.2";