diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index c27c6c60eec4..1bec0d925222 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -221,11 +221,14 @@ in rec {
       mkdir -p $dst/epub/OEBPS/images/callouts
       cp -r ${docbook5_xsl}/xml/xsl/docbook/images/callouts/*.gif $dst/epub/OEBPS/images/callouts
       echo "application/epub+zip" > mimetype
-      zip -0Xq  "$dst/NixOS Manual - NixOS community.epub" mimetype
-      zip -Xr9D "$dst/NixOS Manual - NixOS community.epub" $dst/epub/*
+      manual="$dst/nixos-manual.epub"
+      zip -0Xq "$manual" mimetype
+      cd $dst/epub && zip -Xr9D "$manual" *
+
+      rm -rf $dst/epub
 
       mkdir -p $out/nix-support
-      echo "doc-epub manual $dst/NixOS Manual - NixOS community.epub" >> $out/nix-support/hydra-build-products
+      echo "doc-epub manual $manual" >> $out/nix-support/hydra-build-products
     '';
   };