diff --git a/ROADMAP b/ROADMAP
index 45fce45912364e1dbedd0c3724ef4e140815c456..2475cb637ceb6eb43f54d080c56e5793041b76e5 100644
--- a/ROADMAP
+++ b/ROADMAP
@@ -77,6 +77,6 @@ Freenode!
     + build containers like guix-daemon does
     + provide a Plash-like interface in Bash
   - daemon rewritten in Guile
-  - more dmd integration
+  - more shepherd integration
     + monitor network interfaces and start/stop events based on that
     + include a DHCP client written in Scheme
diff --git a/build-aux/hydra/demo-os.scm b/build-aux/hydra/demo-os.scm
index c6e05ef8e2b8c2f8bc482457c6b4d1fe98744a1f..d933bc8b253470e98939a6817a3d5816f7eb742f 100644
--- a/build-aux/hydra/demo-os.scm
+++ b/build-aux/hydra/demo-os.scm
@@ -57,7 +57,7 @@
 
 This image features the GNU Guix package manager, which was used to
 build it (http://www.gnu.org/software/guix/).  The init system is
-GNU dmd (http://www.gnu.org/software/dmd/).
+the GNU Shepherd (http://www.gnu.org/software/shepherd/).
 
 You can log in as 'guest' or 'root' with no password.
 ")
diff --git a/gnu/build/install.scm b/gnu/build/install.scm
index 9085e22e09881dfe9e35d9c0db900bfdd6eacaf3..9785b6d81ba3333ba8805bb8510585150fab3152 100644
--- a/gnu/build/install.scm
+++ b/gnu/build/install.scm
@@ -103,7 +103,7 @@ (define (directives store)
     (directory ,store 0 30000 #o1775)
 
     (directory "/etc")
-    (directory "/var/log")                          ; for dmd
+    (directory "/var/log")                          ; for shepherd
     (directory "/var/guix/gcroots")
     (directory "/var/empty")                        ; for no-login accounts
     (directory "/var/db")                           ; for dhclient, etc.