diff --git a/doc/default.nix b/doc/default.nix
index 669179141060..2c9a0439feb5 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -3,4 +3,4 @@
   nixpkgs ? { },
 }:
 
-pkgs.callPackage ./doc-support/package.nix { inherit nixpkgs; }
+pkgs.nixpkgs-manual.override { inherit nixpkgs; }
diff --git a/doc/doc-support/epub.nix b/doc/doc-support/epub.nix
index 259207535a09..2b8d6b5f2470 100644
--- a/doc/doc-support/epub.nix
+++ b/doc/doc-support/epub.nix
@@ -1,4 +1,4 @@
-# To run this derivation, `nix-build -A nixpkgs-manual.epub`
+# To build this derivation, run `nix-build -A nixpkgs-manual.epub`
 {
   lib,
   runCommand,
diff --git a/doc/doc-support/lib-function-docs.nix b/doc/doc-support/lib-function-docs.nix
index 1ce052e4852f..8c9673d887bf 100644
--- a/doc/doc-support/lib-function-docs.nix
+++ b/doc/doc-support/lib-function-docs.nix
@@ -1,5 +1,5 @@
 # Generates the documentation for library functions via nixdoc.
-# To run this derivation, `nix-build -A nixpkgs-manual.lib-docs`
+# To build this derivation, run `nix-build -A nixpkgs-manual.lib-docs`
 {
   lib,
   stdenvNoCC,
diff --git a/doc/doc-support/options-doc.nix b/doc/doc-support/options-doc.nix
index e1684d35700e..aa24f16901c5 100644
--- a/doc/doc-support/options-doc.nix
+++ b/doc/doc-support/options-doc.nix
@@ -1,4 +1,4 @@
-# To run this derivation, `nix-build -A nixpkgs-manual.optionsDoc`
+# To build this derivation, run `nix-build -A nixpkgs-manual.optionsDoc`
 { lib, nixosOptionsDoc }:
 
 let
diff --git a/doc/doc-support/package.nix b/doc/doc-support/package.nix
index aa70184bf935..c0213bad4c27 100644
--- a/doc/doc-support/package.nix
+++ b/doc/doc-support/package.nix
@@ -1,3 +1,6 @@
+# This file describes the Nixpkgs manual, which happens to use module docs infra originally
+# developed for NixOS. To build this derivation, run `nix-build -A nixpkgs-manual`.
+#
 {
   lib,
   stdenvNoCC,
@@ -92,7 +95,6 @@ stdenvNoCC.mkDerivation (
 
       epub = callPackage ./epub.nix { };
 
-      # NB: This file describes the Nixpkgs manual, which happens to use module docs infra originally developed for NixOS.
       optionsDoc = callPackage ./options-doc.nix { };
 
       pythonInterpreterTable = callPackage ./python-interpreter-table.nix { };
diff --git a/doc/doc-support/python-interpreter-table.nix b/doc/doc-support/python-interpreter-table.nix
index ca80d7631703..f06609e363f2 100644
--- a/doc/doc-support/python-interpreter-table.nix
+++ b/doc/doc-support/python-interpreter-table.nix
@@ -1,4 +1,4 @@
-# To run this derivation, `nix-build -A nixpkgs-manual.pythonInterpreterTable`
+# To build this derivation, run `nix-build -A nixpkgs-manual.pythonInterpreterTable`
 {
   lib,
   writeText,
diff --git a/doc/tests/manpage-urls.nix b/doc/tests/manpage-urls.nix
index 0a3adec20655..214c23616009 100644
--- a/doc/tests/manpage-urls.nix
+++ b/doc/tests/manpage-urls.nix
@@ -1,4 +1,4 @@
-# To run this derivation, `nix-build -A nixpkgs-manual.tests.manpage-urls`
+# To build this derivation, run `nix-build -A nixpkgs-manual.tests.manpage-urls`
 {
   lib,
   runCommand,
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2d419ef217aa..192d22ed4e9b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -39140,6 +39140,8 @@ with pkgs;
 
   nixpkgs-lint-community = callPackage ../tools/nix/nixpkgs-lint { };
 
+  nixpkgs-manual = callPackage ../../doc/doc-support/package.nix { };
+
   rnix-hashes = callPackage ../tools/nix/rnix-hashes { };
 
   nixos-artwork = callPackage ../data/misc/nixos-artwork { };
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index f79352bf3ffe..5800376c9153 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -77,9 +77,8 @@ let
 
       release-checks = import ./nixpkgs-basic-release-checks.nix { inherit pkgs nixpkgs supportedSystems; };
 
+      manual = pkgs.nixpkgs-manual.override { inherit nixpkgs; };
       metrics = import ./metrics.nix { inherit pkgs nixpkgs; };
-
-      manual = import ../../doc { inherit pkgs nixpkgs; };
       lib-tests = import ../../lib/tests/release.nix { inherit pkgs; };
       pkgs-lib-tests = import ../pkgs-lib/tests { inherit pkgs; };