diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 3fe7916d8..009403dde 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -38,6 +38,9 @@
     <listitem>
       <para>2014-11-28</para>
       <itemizedlist>
+        <listitem>
+          <para>[krejzi] - Updated to systemd-217.</para>
+        </listitem>
         <listitem>
           <para>[krejzi] - Updated to dbus-1.8.12.</para>
         </listitem>
diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index 21b6c008c..332952597 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -61,11 +61,16 @@ EOF</userinput></screen>
 
 <screen><userinput remap="pre">sed -i "s:blkid/::" $(grep -rl "blkid/blkid.h")</userinput></screen>
 
-    <para>Apply a patch so that compat <command>pkg-config</command> files get
-    installed without installing compat libs which are useless on LFS:</para>
+    <para>Apply the following patch so that compat <command>pkg-config</command> files
+    get installed without installing compat libs which are useless on LFS:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&systemd-compat-patch;</userinput></screen>
 
+    <para>Also, apply the following patch to fix various bugs that have been
+    addressed upstream:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&systemd-fixes-patch;</userinput></screen>
+
     <para>Prepare systemd for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr                                           \
@@ -175,6 +180,7 @@ EOF</userinput></screen>
 
 <screen><userinput remap="test">sed -e "s:test/udev-test.pl::g"              \
     -e "s:test-bus-cleanup\$(EXEEXT) ::g"    \
+    -e "s:test-cgroup-mask\$(EXEEXT) ::g"    \
     -e "s:test-condition-util\$(EXEEXT) ::g" \
     -e "s:test-dhcp6-client\$(EXEEXT) ::g"   \
     -e "s:test-engine\$(EXEEXT) ::g"         \
diff --git a/packages.ent b/packages.ent
index 07abbe0a9..9857dacda 100644
--- a/packages.ent
+++ b/packages.ent
@@ -525,13 +525,13 @@
 <!ENTITY shadow-ch6-du "42 MB">
 <!ENTITY shadow-ch6-sbu "0.2 SBU">
 
-<!ENTITY systemd-version "216">
-<!ENTITY systemd-size    "3,532 KB">
+<!ENTITY systemd-version "217">
+<!ENTITY systemd-size    "3,608 KB">
 <!ENTITY systemd-url     "http://www.freedesktop.org/software/systemd/systemd-&systemd-version;.tar.xz">
-<!ENTITY systemd-md5     "04fda588a04f549da0f397dce3ae6a39">
+<!ENTITY systemd-md5     "e68dbff3cc19f66e341572d9fb2ffa89">
 <!ENTITY systemd-home    "http://www.freedesktop.org/wiki/Software/systemd/">
-<!ENTITY systemd-ch6-du  "678 MB">
-<!ENTITY systemd-ch6-sbu "2.1 SBU">
+<!ENTITY systemd-ch6-du  "666 MB">
+<!ENTITY systemd-ch6-sbu "2.0 SBU">
 
 <!ENTITY tar-version "1.28">
 <!ENTITY tar-size "1,921 KB">
diff --git a/patches.ent b/patches.ent
index 0c01d26cd..56b8076d3 100644
--- a/patches.ent
+++ b/patches.ent
@@ -73,6 +73,10 @@
 <!ENTITY systemd-compat-patch-md5 "f26da3adcdc621ea0d715d60baa91962">
 <!ENTITY systemd-compat-patch-size "8 KB">
 
+<!ENTITY systemd-fixes-patch "systemd-&systemd-version;-upstream_fixes-1.patch">
+<!ENTITY systemd-fixes-patch-md5 "9b06388a5b812ba89e11167a10595570">
+<!ENTITY systemd-fixes-patch-size "32 KB">
+
 <!--
 <!ENTITY tar-manpage-patch "tar-&tar-version;-manpage-1.patch">
 <!ENTITY tar-manpage-patch-md5 "321f85ec32733b1a9399e788714a5156">