diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a49317b2934c..c8736a94fa40 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -27413,6 +27413,12 @@
     githubId = 79593869;
     name = "Gramdalf";
   };
+  therealhammer = {
+    email = "thierry.hammer@googlemail.com";
+    github = "therealhammer";
+    githubId = 32392096;
+    name = "Thierry Hammer";
+  };
   therealr5 = {
     email = "rouven@rfive.de";
     github = "rouven0";
diff --git a/pkgs/by-name/jo/john/opencl.patch b/pkgs/by-name/jo/john/opencl.patch
index 575bfa82638b..0e9d998b7c19 100644
--- a/pkgs/by-name/jo/john/opencl.patch
+++ b/pkgs/by-name/jo/john/opencl.patch
@@ -6,12 +6,12 @@ index 790705330..2acedbc56 100755
  
  	/* Names to try to load */
  	const char * const opencl_names[] = {
+-		"libOpenCL.so.1",	/* Linux/others */
 -		"libOpenCL.so",		/* Linux/others, hack via "development" sub-package's symlink */
 -		"OpenCL",		/* _WIN */
 -		"/System/Library/Frameworks/OpenCL.framework/OpenCL", /* __APPLE__ */
 -		"opencl.dll",		/* __CYGWIN__ */
--		"cygOpenCL-1.dll",	/* __CYGWIN__ */
--		"libOpenCL.so.1"	/* Linux/others, no "development" sub-package installed */
+-		"cygOpenCL-1.dll"	/* __CYGWIN__ */
 +		"@ocl_icd@/lib/libOpenCL.so"	/* NixOS */
  	};
  
diff --git a/pkgs/by-name/jo/john/package.nix b/pkgs/by-name/jo/john/package.nix
index 3e6702862af4..c3270044195f 100644
--- a/pkgs/by-name/jo/john/package.nix
+++ b/pkgs/by-name/jo/john/package.nix
@@ -25,13 +25,13 @@
 
 stdenv.mkDerivation {
   pname = "john";
-  version = "rolling-2404";
+  version = "rolling-2604";
 
   src = fetchFromGitHub {
     owner = "openwall";
     repo = "john";
-    rev = "f9fedd238b0b1d69181c1fef033b85c787e96e57";
-    hash = "sha256-XMT5Sbp2XrAnfTHxXyJdw0kA/ZtfOiYrX/flCFLHJ6s=";
+    rev = "f514ece8ec4ae5e38ad75aaa322eac86d73dcd76";
+    hash = "sha256-Fzt9KnMFBTdPpQMSlXe/zG9LMylAZnC6uzU4yJ6HSUk=";
   };
 
   patches = lib.optionals withOpenCL [
@@ -142,6 +142,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/openwall/john/";
     maintainers = with lib.maintainers; [
       cherrykitten
+      therealhammer
     ];
     platforms = lib.platforms.unix;
   };