diff --git a/pkgs/tools/networking/p2p/bittornado/default.nix b/pkgs/tools/networking/p2p/bittornado/default.nix
new file mode 100644
index 00000000000..8cda50bcb1d
--- /dev/null
+++ b/pkgs/tools/networking/p2p/bittornado/default.nix
@@ -0,0 +1,26 @@
+{ lib, python3, fetchFromGitHub }:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "BitTornado";
+  version = "unstable-2018-02-09";
+
+  src = fetchFromGitHub {
+    owner = "effigies";
+    repo = "BitTornado";
+    rev = "a3e6d8bcdf9d99de064dc58b4a3e909e0349e589";
+    sha256 = "099bci3as592psf8ymmz225qyz2lbjhya7g50cb7hk64k92mqk9k";
+  };
+
+  postFixup = ''
+    for i in $(ls $out/bin); do		
+      mv $out/bin/$i $out/bin/''${i%.py}
+    done
+  '';
+
+  meta = with lib; {
+    inherit (src.meta) homepage;
+    description = "John Hoffman's fork of the original bittorrent";
+    license = licenses.mit;
+    maintainers = with maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0c4fccffc84..8ce802c2fb7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -866,6 +866,8 @@ with pkgs;
 
   bitbucket-cli = python2Packages.bitbucket-cli;
 
+  bittornado = callPackage ../tools/networking/p2p/bittornado { };
+
   blink = callPackage ../applications/networking/instant-messengers/blink { };
 
   blockhash = callPackage ../tools/graphics/blockhash { };