diff --git a/pkgs/by-name/ma/maxima-ecl/package.nix b/pkgs/by-name/ma/maxima-ecl/package.nix
new file mode 100644
index 000000000000..9a7b347e3d91
--- /dev/null
+++ b/pkgs/by-name/ma/maxima-ecl/package.nix
@@ -0,0 +1,17 @@
+{
+  maxima,
+  ecl,
+  lisp-compiler ? ecl,
+  ...
+}@args:
+
+maxima.override (
+  {
+    inherit lisp-compiler;
+  }
+  // removeAttrs args [
+    "maxima"
+    "ecl"
+    "lisp-compiler"
+  ]
+)
diff --git a/pkgs/applications/science/math/maxima/5.47.0-CVE-2024-34490.patch b/pkgs/by-name/ma/maxima/5.47.0-CVE-2024-34490.patch
similarity index 100%
rename from pkgs/applications/science/math/maxima/5.47.0-CVE-2024-34490.patch
rename to pkgs/by-name/ma/maxima/5.47.0-CVE-2024-34490.patch
diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/by-name/ma/maxima/package.nix
similarity index 99%
rename from pkgs/applications/science/math/maxima/default.nix
rename to pkgs/by-name/ma/maxima/package.nix
index 462ea5d853fd..ab65bdd92b12 100644
--- a/pkgs/applications/science/math/maxima/default.nix
+++ b/pkgs/by-name/ma/maxima/package.nix
@@ -8,10 +8,11 @@
   python3,
   makeWrapper,
   autoreconfHook,
+  sbcl,
   rlwrap ? null,
   tk ? null,
   gnuplot ? null,
-  lisp-compiler,
+  lisp-compiler ? sbcl,
 }:
 
 let
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f864001a47cc..5675f04cf75c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11579,13 +11579,6 @@ with pkgs;
 
   gap-full = lowPrio (gap.override { packageSet = "full"; });
 
-  maxima = callPackage ../applications/science/math/maxima {
-    lisp-compiler = sbcl;
-  };
-  maxima-ecl = maxima.override {
-    lisp-compiler = ecl;
-  };
-
   ### SCIENCE / MISC
 
   boinc-headless = boinc.override { headless = true; };