diff --git a/pkgs/tools/misc/geekbench/4.nix b/pkgs/by-name/ge/geekbench/4.nix
similarity index 100%
rename from pkgs/tools/misc/geekbench/4.nix
rename to pkgs/by-name/ge/geekbench/4.nix
diff --git a/pkgs/tools/misc/geekbench/5.nix b/pkgs/by-name/ge/geekbench/5.nix
similarity index 100%
rename from pkgs/tools/misc/geekbench/5.nix
rename to pkgs/by-name/ge/geekbench/5.nix
diff --git a/pkgs/tools/misc/geekbench/6.nix b/pkgs/by-name/ge/geekbench/package.nix
similarity index 83%
rename from pkgs/tools/misc/geekbench/6.nix
rename to pkgs/by-name/ge/geekbench/package.nix
index 41ff65ced4e0..e351e85219e2 100644
--- a/pkgs/tools/misc/geekbench/6.nix
+++ b/pkgs/by-name/ge/geekbench/package.nix
@@ -11,15 +11,19 @@
 
 let
   inherit (stdenv.hostPlatform.uname) processor;
-  version = "6.4.0";
+  version = "6.7.1";
   sources = {
     "x86_64-linux" = {
       url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz";
-      hash = "sha256-Q4MwU3dIFheKKSMxzCBZI8XoForaN41BuRGVMhJaUKw=";
+      hash = "sha256-Ddypd9622dtL2GZIX5QI5y4oadDeoHN7GNS/5HKFis4=";
     };
     "aarch64-linux" = {
       url = "https://cdn.geekbench.com/Geekbench-${version}-LinuxARMPreview.tar.gz";
-      hash = "sha256-PZ95w2X4sqTLZGZ5wygt7WjSK4Gfgtdh/UCPo+8Ysc8=";
+      hash = "sha256-blmsuD5t6jZx4uKVNl/DfED90oDNvd1QrPJIkQ4UoOM=";
+    };
+    "riscv64-linux" = {
+      url = "https://cdn.geekbench.com/Geekbench-${version}-LinuxRISCVPreview.tar.gz";
+      hash = "sha256-TByNeLqqHrnrLcX/meXNy6Evvebf0/xWnUohd/TwiAk=";
     };
   };
   geekbench_avx2 = lib.optionalString stdenv.hostPlatform.isx86_64 "geekbench_avx2";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b100486f0c2a..365180be9d3b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1711,10 +1711,9 @@ with pkgs;
 
   inherit (go-containerregistry) crane gcrane;
 
-  geekbench_4 = callPackage ../tools/misc/geekbench/4.nix { };
-  geekbench_5 = callPackage ../tools/misc/geekbench/5.nix { };
-  geekbench_6 = callPackage ../tools/misc/geekbench/6.nix { };
-  geekbench = geekbench_6;
+  geekbench_4 = callPackage ../by-name/ge/geekbench/4.nix { };
+  geekbench_5 = callPackage ../by-name/ge/geekbench/5.nix { };
+  geekbench_6 = geekbench;
 
   ghidra = callPackage ../tools/security/ghidra/build.nix {
     protobuf = protobuf_21;