diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
index 60754a4121f2..279ac72442b8 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
@@ -224,18 +224,7 @@
 
   };
 
-  ott-mode = self.trivialBuild {
-    pname = "ott-mod";
-
-    inherit (pkgs.ott) src version;
-
-    postUnpack = "mv $sourceRoot/emacs/ott-mode.el $sourceRoot";
-
-    meta = {
-      description = "Standalone package providing ott-mode without building ott and with compiled bytecode.";
-      inherit (pkgs.haskellPackages.Agda.meta) homepage license;
-    };
-  };
+  ott-mode = callPackage ./ott-mode { };
 
   urweb-mode = callPackage ./urweb-mode { };
 
diff --git a/pkgs/applications/editors/emacs/elisp-packages/ott-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/ott-mode/default.nix
new file mode 100644
index 000000000000..6eeead468ff2
--- /dev/null
+++ b/pkgs/applications/editors/emacs/elisp-packages/ott-mode/default.nix
@@ -0,0 +1,19 @@
+{ trivialBuild
+, ott
+, haskellPackages
+}:
+
+trivialBuild {
+  pname = "ott-mode";
+
+  inherit (ott) src version;
+
+  postUnpack = ''
+    mv $sourceRoot/emacs/ott-mode.el $sourceRoot
+  '';
+
+  meta = {
+    description = "Emacs ott mode (from ott sources)";
+    inherit (haskellPackages.Agda.meta) homepage license;
+  };
+}