diff --git a/artiq/default.nix b/artiq/default.nix
index 32cb4fa..e699952 100644
--- a/artiq/default.nix
+++ b/artiq/default.nix
@@ -29,6 +29,11 @@ let
           boardBinaries = boardBinaries;
         };
       }) {} boards;
+
+  manualPackages = import ./pkgs/artiq-manual.nix {
+    inherit stdenv lib fetchgit python3Packages texlive texinfo;
+    inherit (pythonDeps) sphinx-argparse sphinxcontrib-wavedrom;
+  };
 in
   rec {
     inherit (rust) rustc;
@@ -37,7 +42,6 @@ in
     llvm-or1k = callPackage ./pkgs/llvm-or1k.nix { inherit llvm-src; };
     llvmlite-artiq = callPackage ./pkgs/llvmlite-artiq.nix { inherit llvm-or1k; };
     artiq = callPackage ./pkgs/artiq.nix { inherit binutils-or1k; inherit llvm-or1k; inherit llvmlite-artiq; };
-    artiq-manual = callPackage ./pkgs/artiq-manual.nix { inherit (pythonDeps) sphinx-argparse sphinxcontrib-wavedrom; };
     openocd = callPackage ./pkgs/openocd.nix {};
     conda-artiq = import ./conda-artiq.nix { inherit pkgs; };
-  } //  boardPackages
+  } // boardPackages // manualPackages
diff --git a/artiq/pkgs/artiq-manual.nix b/artiq/pkgs/artiq-manual.nix
index 2d0b816..4ca6fc4 100644
--- a/artiq/pkgs/artiq-manual.nix
+++ b/artiq/pkgs/artiq-manual.nix
@@ -55,4 +55,4 @@ let
   # and simplify `targets`:
   targets = [ "html" ] ++ (lib.optional (builtins.compareVersions sphinxcontrib-wavedrom.version "2.0.0" != -1) "latexpdf");
 in
-  builtins.listToAttrs (map (target: { name = target; value = artiq-manual target; }) targets)
+  builtins.listToAttrs (map (target: { name = "artiq-manual-${target}"; value = artiq-manual target; }) targets)