diff --git a/doc/Makefile.am b/doc/Makefile.am
index c1456c37..fa67d937 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -6,5 +6,5 @@ dist_docs_DATA  = README.md build.md cmdline.md commands.md		\
 		  requirements.md runlevels.md runparts.md		\
 		  service.md signals.md state-machine.md		\
 		  watchdog.md
-dist_docs_DATA += logo.png svc-machine.png svc-machine.svg		\
+dist_docs_DATA += img/logo.png img/svc-machine.png img/svc-machine.svg	\
 		  img/alpine-screenshot2.png
diff --git a/doc/conditions.md b/doc/conditions.md
index 3b726b3f..a08a1cb7 100644
--- a/doc/conditions.md
+++ b/doc/conditions.md
@@ -265,7 +265,7 @@ A condition is always in one of three states:
 All conditions that have not explicitly been set are interpreted as
 being in the `off` state.
 
-![The service state machine](svc-machine.png "The service state machine")
+![The service state machine](img/svc-machine.png "The service state machine")
 
 When a reconfiguration is requested, Finit transitions all conditions to
 the `flux` state.  As a result, services that depend on a condition are
diff --git a/doc/logo.png b/doc/img/logo.png
similarity index 100%
rename from doc/logo.png
rename to doc/img/logo.png
diff --git a/doc/svc-machine.png b/doc/img/svc-machine.png
similarity index 100%
rename from doc/svc-machine.png
rename to doc/img/svc-machine.png
diff --git a/doc/svc-machine.svg b/doc/img/svc-machine.svg
similarity index 100%
rename from doc/svc-machine.svg
rename to doc/img/svc-machine.svg
diff --git a/doc/state-machine.md b/doc/state-machine.md
index 3c58fbc6..3beef69f 100644
--- a/doc/state-machine.md
+++ b/doc/state-machine.md
@@ -6,7 +6,7 @@ run/tasks there is an additional end state called `DONE`.  All processes
 managed by Finit start in the `HALTED` state.  The image shows how both
 conditions and commands drive the machine.
 
-![The service state machine](svc-machine.png "The service state machine")
+![The service state machine](img/svc-machine.png "The service state machine")
 
 The current state depends on the two following conditions:
 
diff --git a/mkdocs.yml b/mkdocs.yml
index 7bc6e7e6..508f3491 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -11,7 +11,7 @@ exclude_docs: |
   TODO.md
 
 theme:
-  logo: logo.png
+  logo: img/logo.png
   name: material
   features:
     - toc.follow