diff --git a/doc/manual.xml b/doc/manual.xml
index de94e1c8258..d679b3d8bfe 100644
--- a/doc/manual.xml
+++ b/doc/manual.xml
@@ -15,11 +15,11 @@
  </part>
  <part>
   <title>Standard environment</title>
-  <xi:include href="stdenv.xml" />
-  <xi:include href="meta.xml" />
-  <xi:include href="multiple-output.xml" />
-  <xi:include href="cross-compilation.xml" />
-  <xi:include href="platform-notes.xml" />
+  <xi:include href="stdenv/stdenv.xml" />
+  <xi:include href="stdenv/meta.xml" />
+  <xi:include href="stdenv/multiple-output.xml" />
+  <xi:include href="stdenv/cross-compilation.xml" />
+  <xi:include href="stdenv/platform-notes.xml" />
  </part>
  <part>
   <title>Builders</title>
diff --git a/doc/cross-compilation.xml b/doc/stdenv/cross-compilation.xml
similarity index 100%
rename from doc/cross-compilation.xml
rename to doc/stdenv/cross-compilation.xml
diff --git a/doc/meta.xml b/doc/stdenv/meta.xml
similarity index 100%
rename from doc/meta.xml
rename to doc/stdenv/meta.xml
diff --git a/doc/multiple-output.xml b/doc/stdenv/multiple-output.xml
similarity index 100%
rename from doc/multiple-output.xml
rename to doc/stdenv/multiple-output.xml
diff --git a/doc/platform-notes.xml b/doc/stdenv/platform-notes.xml
similarity index 100%
rename from doc/platform-notes.xml
rename to doc/stdenv/platform-notes.xml
diff --git a/doc/stdenv.xml b/doc/stdenv/stdenv.xml
similarity index 100%
rename from doc/stdenv.xml
rename to doc/stdenv/stdenv.xml