diff --git a/pkgs/applications/misc/hovercraft/default.nix b/pkgs/applications/misc/hovercraft/default.nix
new file mode 100644
index 00000000000..ba23078bba9
--- /dev/null
+++ b/pkgs/applications/misc/hovercraft/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, buildPythonApplication
+, isPy3k
+, fetchFromGitHub
+, manuel
+, setuptools
+, docutils
+, lxml
+, svg-path
+, pygments
+, watchdog
+}:
+
+buildPythonApplication rec {
+  pname = "hovercraft";
+  version = "2.6";
+  disabled = ! isPy3k;
+
+  src = fetchFromGitHub {
+    owner = "regebro";
+    repo = "hovercraft";
+    rev = version;
+    sha256 = "150sn6kvqi2s89di1akl5i0g81fasji2ipr12zq5s4dcnhw4r5wp";
+  };
+
+  checkInputs = [ manuel ];
+  propagatedBuildInputs = [ setuptools docutils lxml svg-path pygments watchdog ];
+
+  meta = with lib; {
+    description = "Makes impress.js presentations from reStructuredText";
+    homepage = https://github.com/regebro/hovercraft;
+    license = licenses.mit;
+    maintainers = with maintainers; [ goibhniu makefu ];
+  };
+}
diff --git a/pkgs/development/python-modules/hovercraft/default.nix b/pkgs/development/python-modules/hovercraft/default.nix
deleted file mode 100644
index e598fd41bab..00000000000
--- a/pkgs/development/python-modules/hovercraft/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, docutils
-, lxml
-, manuel
-, pygments
-, svg-path
-, watchdog
-, isPy3k
-}:
-
-buildPythonPackage rec {
-  pname = "hovercraft";
-  version = "2.0";
-  disabled = ! isPy3k;
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0lqxr816lymgnywln8bbv9nrmkyahjjcjkm9kjyny9bflayz4f1g";
-  };
-
-  propagatedBuildInputs = [ docutils lxml manuel pygments svg-path watchdog ];
-
-  # one test assumes we have docutils 0.12
-  # TODO: enable tests after upgrading docutils to 0.12
-  doCheck = false;
-
-  meta = with stdenv.lib; {
-    description = "A tool to make impress.js presentations from reStructuredText";
-    homepage = https://github.com/regebro/hovercraft;
-    license = licenses.mit;
-    maintainers = with maintainers; [ goibhniu ];
-  };
-
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 42e85c806e0..a906642bd8e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17268,6 +17268,8 @@ with pkgs;
     gtk = gtk3;
   };
 
+  hovercraft = python3Packages.callPackage ../applications/misc/hovercraft { };
+
   howl = callPackage ../applications/editors/howl { };
 
   ht = callPackage ../applications/editors/ht { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 397ae5c362f..905e6ccec2d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1696,8 +1696,6 @@ in {
 
   hupper = callPackage ../development/python-modules/hupper {};
 
-  hovercraft = callPackage ../development/python-modules/hovercraft { };
-
   hsaudiotag = callPackage ../development/python-modules/hsaudiotag { };
 
   hsaudiotag3k = callPackage ../development/python-modules/hsaudiotag3k { };