diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix
index 97f6ec21b54893..d4db02cc9ed1d7 100644
--- a/pkgs/tools/security/john/default.nix
+++ b/pkgs/tools/security/john/default.nix
@@ -6,15 +6,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "john-${version}";
-  version = "1.8.0-jumbo-1";
+  version = "1.9.0-jumbo-1";
 
   src = fetchurl {
-    url = "http://www.openwall.com/john/j/${name}.tar.xz";
-    sha256 = "08q92sfdvkz47rx6qjn7qv57cmlpy7i7rgddapq5384mb413vjds";
+    url = "http://www.openwall.com/john/k/${name}.tar.xz";
+    sha256 = "0fvz3v41hnaiv1ggpxanfykyfjq79cwp9qcqqn63vic357w27lgm";
   };
 
-  patches = [ ./gcc5.patch ];
-
   postPatch = ''
     sed -ri -e '
       s!^(#define\s+CFG_[A-Z]+_NAME\s+).*/!\1"'"$out"'/etc/john/!
diff --git a/pkgs/tools/security/john/gcc5.patch b/pkgs/tools/security/john/gcc5.patch
deleted file mode 100644
index 73da83483f909f..00000000000000
--- a/pkgs/tools/security/john/gcc5.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/common.h b/src/common.h
---- a/src/common.h
-+++ b/src/common.h
-@@ -31,7 +31,9 @@ typedef unsigned long long ARCH_WORD_64;
- #define is_aligned(PTR, CNT) ((((ARCH_WORD)(const void *)(PTR))&(CNT-1))==0)
- 
- #ifdef __GNUC__
--#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7) || defined(__INTEL_COMPILER)
-+#if __GNUC__ >= 5
-+#define MAYBE_INLINE __attribute__((gnu_inline)) inline
-+#elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7) || defined(__INTEL_COMPILER)
- #define MAYBE_INLINE __attribute__((always_inline)) inline
- #elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
- #define MAYBE_INLINE __attribute__((always_inline))