diff --git a/doc/builders/images.xml b/doc/builders/images.xml
new file mode 100644
index 00000000000..5e042a8ada8
--- /dev/null
+++ b/doc/builders/images.xml
@@ -0,0 +1,12 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xml:id="chap-images">
+ <title>Images</title>
+ <para>
+  This chapter describes tools for creating various types of images.
+ </para>
+ <xi:include href="images/appimagetools.xml" />
+ <xi:include href="images/dockertools.xml" />
+ <xi:include href="images/ocitools.xml" />
+ <xi:include href="images/snaptools.xml" />
+</chapter>
diff --git a/doc/functions/appimagetools.xml b/doc/builders/images/appimagetools.xml
similarity index 100%
rename from doc/functions/appimagetools.xml
rename to doc/builders/images/appimagetools.xml
diff --git a/doc/functions/dockertools.xml b/doc/builders/images/dockertools.xml
similarity index 100%
rename from doc/functions/dockertools.xml
rename to doc/builders/images/dockertools.xml
diff --git a/doc/functions/ocitools.xml b/doc/builders/images/ocitools.xml
similarity index 100%
rename from doc/functions/ocitools.xml
rename to doc/builders/images/ocitools.xml
diff --git a/doc/functions/snap/example-firefox.nix b/doc/builders/images/snap/example-firefox.nix
similarity index 100%
rename from doc/functions/snap/example-firefox.nix
rename to doc/builders/images/snap/example-firefox.nix
diff --git a/doc/functions/snap/example-hello.nix b/doc/builders/images/snap/example-hello.nix
similarity index 100%
rename from doc/functions/snap/example-hello.nix
rename to doc/builders/images/snap/example-hello.nix
diff --git a/doc/functions/snaptools.xml b/doc/builders/images/snaptools.xml
similarity index 100%
rename from doc/functions/snaptools.xml
rename to doc/builders/images/snaptools.xml
diff --git a/doc/functions.xml b/doc/functions.xml
index 81aef5f3a83..29b27d7d0de 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -12,10 +12,6 @@
  <xi:include href="functions/debug.xml" />
  <xi:include href="functions/fhs-environments.xml" />
  <xi:include href="functions/shell.xml" />
- <xi:include href="functions/dockertools.xml" />
- <xi:include href="functions/snaptools.xml" />
- <xi:include href="functions/appimagetools.xml" />
  <xi:include href="functions/prefer-remote-fetch.xml" />
  <xi:include href="functions/nix-gitignore.xml" />
- <xi:include href="functions/ocitools.xml" />
 </chapter>
diff --git a/doc/manual.xml b/doc/manual.xml
index d0ded1e2e16..525373a3427 100644
--- a/doc/manual.xml
+++ b/doc/manual.xml
@@ -24,6 +24,7 @@
   <title>Builders</title>
   <xi:include href="builders/fetchers.xml" />
   <xi:include href="builders/trivial-builders.xml" />
+  <xi:include href="builders/images.xml" />
   <xi:include href="languages-frameworks/index.xml" />
   <xi:include href="packages/index.xml" />
  </part>