diff --git a/pkgs/games/maptool/default.nix b/pkgs/by-name/ma/maptool/package.nix
similarity index 96%
rename from pkgs/games/maptool/default.nix
rename to pkgs/by-name/ma/maptool/package.nix
index 0365cb52d429f..e1f71c3abf51d 100644
--- a/pkgs/games/maptool/default.nix
+++ b/pkgs/by-name/ma/maptool/package.nix
@@ -13,11 +13,11 @@
 }:
 let
   pname = "maptool";
-  version = "1.17.1";
+  version = "1.18.5";
   repoBase = "https://github.com/RPTools/maptool";
   src = fetchurl {
     url = "${repoBase}/releases/download/${version}/maptool-${version}-x86_64.pkg.tar.zst";
-    hash = "sha256-yPuZUPRP0O+5Grj53xteZovowuFxOo4q6qL3mnjgIu0=";
+    hash = "sha256-67szWKgx3B5HacpzYThxGDHKHK5qz2GQ15+ZEuEGlAU=";
   };
 
   meta = with lib; {
@@ -124,7 +124,7 @@ stdenvNoCC.mkDerivation {
 
     dest=$out/bin
     install -dm755 "$dest"
-    makeWrapper ${jre}/bin/java "$dest"/${binName} \
+    makeWrapper ${lib.getExe jre} "$dest"/${binName} \
       "''${gappsWrapperArgs[@]}" \
       --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ ffmpeg ]} \
       --add-flags "${lib.concatStringsSep " " jvmArgs} net.rptools.maptool.client.LaunchInstructions"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd669e9b308c1..2ea39e86b9eed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13862,14 +13862,6 @@ with pkgs;
 
   liquidwar5 = callPackage ../games/liquidwar/5.nix { };
 
-  maptool = callPackage ../games/maptool {
-    # MapTool is fussy about which JRE it uses; OpenJDK will leave it hanging
-    # at launch in a class initialization deadlock. MapTool ships Temurin with
-    # their pre-built releases so we might as well use it too.
-    jre = temurin-bin-21;
-    openjfx = openjfx21;
-  };
-
   mindustry-wayland = callPackage ../by-name/mi/mindustry/package.nix {
     enableWayland = true;
   };