diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix
index 4ef9b8f65b6..cde2047a5f1 100644
--- a/pkgs/tools/security/john/default.nix
+++ b/pkgs/tools/security/john/default.nix
@@ -1,29 +1,34 @@
-{ stdenv, fetchgit, openssl, nss, nspr, kerberos, gmp, zlib, libpcap, re2 }:
+{ stdenv, fetchurl, openssl, nss, nspr, kerberos, gmp, zlib, libpcap, re2 }:
 
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "JohnTheRipper-${version}";
-  version = "8a3e3c1d";
-  buildInputs = [ openssl nss nspr kerberos gmp zlib libpcap re2 ];
-  NIX_CFLAGS_COMPILE = "-DJOHN_SYSTEMWIDE=1";
-  preConfigure = ''cd src'';
-  installPhase = ''
-    ensureDir $out/share/john/
-    ensureDir $out/bin
-    cp -R ../run/* $out/share/john
-    ln -s $out/share/john/john $out/bin/john
-  '';
-  src = fetchgit {
-    url = https://github.com/magnumripper/JohnTheRipper.git;
-    rev = "93f061bc41652c94ae049b52572aac709d18aa4c";
-    sha256 = "1rnfi09830n34jcqaxmsam54p4zsq9a49ic2ljh44lahcipympvy";
+  name = "john-${version}";
+  version = "1.8.0-jumbo-1";
+
+  src = fetchurl {
+    url = "http://www.openwall.com/john/j/${name}.tar.xz";
+    sha256 = "08q92sfdvkz47rx6qjn7qv57cmlpy7i7rgddapq5384mb413vjds";
   };
+
+  buildInputs = [ openssl nss nspr kerberos gmp zlib libpcap re2 ];
+
+  NIX_CFLAGS_COMPILE = "-DJOHN_SYSTEMWIDE=1";
+
+  preConfigure = "cd src";
+
+  installPhase = ''
+    mkdir -p "$out/share/john"
+    mkdir -p "$out/bin"
+    cp -R ../run/* "$out/share/john"
+    ln -s "$out/share/john/john" "$out/bin/john"
+  '';
+
   meta = {
     description = "John the Ripper password cracker";
     license = licenses.gpl2;
     homepage = https://github.com/magnumripper/JohnTheRipper/;
-    maintainers = with maintainers; [offline];
+    maintainers = with maintainers; [ offline ];
     platforms = with platforms; unix;
   };
 }