diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 5749f5815..1300efa4f 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -64,8 +64,8 @@
           <ulink url='&lfs-ticket-root;5615'>#5615</ulink>.</para>
         </listitem>
         <listitem>
-          <para>[bdubbs] - Update to shadow-4.17.0. Fixes
-          <ulink url='&lfs-ticket-root;5616'>#5617</ulink>.</para>
+          <para>[bdubbs] - Update to shadow-4.17.1. Fixes
+          <ulink url='&lfs-ticket-root;5617'>#5617</ulink>.</para>
         </listitem>
         <listitem>
           <para>[bdubbs] - Update to procps-ng-4.0.5. Fixes
diff --git a/chapter04/addinguser.xml b/chapter04/addinguser.xml
index 3f4d07645..1a2068680 100644
--- a/chapter04/addinguser.xml
+++ b/chapter04/addinguser.xml
@@ -20,8 +20,8 @@
   the installation process. As <systemitem class="username">root</systemitem>,
   issue the following commands to add the new user:</para>
 
-<screen><userinput>groupadd lfs
-useradd -s /bin/bash -g lfs -m -k /dev/null lfs</userinput></screen>
+<screen><userinput>groupadd &lfs-groupname;
+useradd -s /bin/bash -g &lfs-groupname; -m -k /dev/null &lfs-username;</userinput></screen>
 
   <variablelist>
     <title>This is what the command line options mean:</title>
@@ -74,15 +74,15 @@ useradd -s /bin/bash -g lfs -m -k /dev/null lfs</userinput></screen>
   have a password), you need to set a password for &lfs-user;.  Issue the
   following command as the &root; user to set the password:</para>
 
-<screen role="nodump"><userinput>passwd lfs</userinput></screen>
+<screen role="nodump"><userinput>passwd &lfs-username;</userinput></screen>
 
   <para>Grant <systemitem class="username">lfs</systemitem> full access to
   all the directories under <filename class="directory">$LFS</filename> by making
   <systemitem class="username">lfs</systemitem> the owner:</para>
 
-<screen><userinput>chown -v lfs $LFS/{usr{,/*},lib,var,etc,bin,sbin,tools}
+<screen><userinput>chown -v &lfs-username; $LFS/{usr{,/*},lib,var,etc,bin,sbin,tools}
 case $(uname -m) in
-  x86_64) chown -v lfs $LFS/lib64 ;;
+  x86_64) chown -v &lfs-username; $LFS/lib64 ;;
 esac</userinput></screen>
 <screen arch="ml_32"  ><userinput>chown -v lfs $LFS/lib32</userinput></screen>
 <screen arch="ml_x32" ><userinput>chown -v lfs $LFS/libx32</userinput></screen>
@@ -97,7 +97,7 @@ esac</userinput></screen>
   logging in as &lfs-user; on a virtual console, or with the following
   substitute/switch user command:</para>
 
-<screen role="nodump"><userinput>su - lfs</userinput></screen>
+<screen role="nodump"><userinput>su - &lfs-username;</userinput></screen>
 
   <para>The <quote><parameter>-</parameter></quote> instructs
   <command>su</command> to start a login shell as opposed to a non-login shell.
diff --git a/chapter07/changingowner.xml b/chapter07/changingowner.xml
index 38f9d9db1..838532025 100644
--- a/chapter07/changingowner.xml
+++ b/chapter07/changingowner.xml
@@ -33,9 +33,9 @@
   user <systemitem class="username">root</systemitem> by running the following
   command:</para>
 
-<screen><userinput>chown --from lfs -R root:root $LFS/{usr,lib,var,etc,bin,sbin,tools}
+<screen><userinput>chown --from &lfs-username; -R root:root $LFS/{usr,lib,var,etc,bin,sbin,tools}
 case $(uname -m) in
-  x86_64) chown --from lfs -R root:root $LFS/lib64 ;;
+  x86_64) chown --from &lfs-username; -R root:root $LFS/lib64 ;;
 esac</userinput></screen>
 
   <para arch="ml_32,ml_x32,ml_all">Some more directories exists for
diff --git a/general.ent b/general.ent
index 4e1480324..b3bce5ae8 100644
--- a/general.ent
+++ b/general.ent
@@ -134,6 +134,8 @@
 
 <!ENTITY root            "<systemitem class='username'>root</systemitem>">
 <!ENTITY lfs-user        "<systemitem class='username'>lfs</systemitem>">
+<!ENTITY lfs-username    "<userinput remap='user'>lfs</userinput>">
+<!ENTITY lfs-groupname   "<userinput remap='group'>lfs</userinput>">
 <!ENTITY devtmpfs        "<systemitem class='filesystem'>devtmpfs</systemitem>">
 <!ENTITY fstab           "<filename>/etc/fstab</filename>">
 <!ENTITY boot-dir        "<filename class='directory'>/boot</filename>">
diff --git a/packages.ent b/packages.ent
index 49af3fb39..2f05068ce 100644
--- a/packages.ent
+++ b/packages.ent
@@ -655,10 +655,10 @@
 <!ENTITY setuptools-fin-du "35 MB">
 <!ENTITY setuptools-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY shadow-version "4.17.0">
-<!ENTITY shadow-size "2,164 KB">
+<!ENTITY shadow-version "4.17.1">
+<!ENTITY shadow-size "2,166 KB">
 <!ENTITY shadow-url "&github;/shadow-maint/shadow/releases/download/&shadow-version;/shadow-&shadow-version;.tar.xz">
-<!ENTITY shadow-md5 "63920a6fb28305401a4ebbde09e88376">
+<!ENTITY shadow-md5 "354d19d2182f8a9dd1097304ddb6cb85">
 <!ENTITY shadow-home "&github;/shadow-maint/shadow/">
 <!ENTITY shadow-fin-du "112 MB">
 <!ENTITY shadow-fin-sbu "0.1 SBU">