diff --git a/chapter06/createfiles.xml b/chapter06/createfiles.xml
index 1aa193ec8..891b629b7 100644
--- a/chapter06/createfiles.xml
+++ b/chapter06/createfiles.xml
@@ -151,6 +151,11 @@ ln -sv bash /bin/sh</userinput></screen>
 bin:x:1:1:bin:/dev/null:/bin/false
 daemon:x:6:6:Daemon User:/dev/null:/bin/false
 messagebus:x:18:18:D-Bus Message Daemon User:/var/run/dbus:/bin/false
+systemd-bus-proxy:64:64:systemd Bus Proxy Daemon:/:/bin/false
+systemd-journal-gateway:65:65:systemd Journal Gateway Daemon:/:/bin/false
+systemd-network:x:66:66:systemd Network Daemon:/:/bin/false
+systemd-resolve:x:67:67:systemd Resolve Daemon:/:/bin/false
+systemd-timesync:x:68:68:systemd Time Sync Daemon:/:/bin/false
 nobody:x:99:99:Unprivileged User:/dev/null:/bin/false</literal>
 EOF</userinput></screen>
 
@@ -181,6 +186,11 @@ adm:x:16:
 messagebus:x:18:
 systemd-journal:x:23:
 mail:x:34:
+systemd-bus-proxy:x:64:
+systemd-journal-gateway:x:65:
+systemd-network:x:66:
+systemd-resolve:x:67:
+systemd-timesync:x:68:
 nogroup:x:99:
 users:x:999:</literal>
 EOF</userinput></screen>
diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index 3961d5a53..120a3e579 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -47,8 +47,7 @@
 <literal>KILL=/bin/kill
 HAVE_BLKID=1
 BLKID_LIBS="-lblkid"
-BLKID_CFLAGS="-I/tools/include/blkid"
-cc_cv_CFLAGS__flto=no</literal>
+BLKID_CFLAGS="-I/tools/include/blkid"</literal>
 EOF</userinput></screen>
 
     <para>Additionally, fix a build error when using Util-Linux built in
@@ -63,7 +62,7 @@ EOF</userinput></screen>
 
     <para>Prepare Systemd for compilation:</para>
 
-<screen><userinput remap="configure">CFLAGS="-fno-lto" ./configure --prefix=/usr                         \
+<screen><userinput remap="configure">./configure --prefix=/usr                         \
             --sysconfdir=/etc                                       \
             --localstatedir=/var                                    \
             --config-cache                                          \