diff --git a/postlfs/security/shadow.xml b/postlfs/security/shadow.xml
index e6d0575c43..813a092bac 100644
--- a/postlfs/security/shadow.xml
+++ b/postlfs/security/shadow.xml
@@ -1,6 +1,6 @@
 <sect1 id="shadow">
 <?dbhtml filename="shadow.html" dir="postlfs"?>
-<title>Shadow-4.0.3</title>
+<title>Shadow-&shadow-version;</title>
 
 <!--
 <sect2>
diff --git a/postlfs/security/shadow/shadow-inst.xml b/postlfs/security/shadow/shadow-inst.xml
index 8df5a9b1f4..20d7fe0b71 100644
--- a/postlfs/security/shadow/shadow-inst.xml
+++ b/postlfs/security/shadow/shadow-inst.xml
@@ -1,21 +1,20 @@
 <sect2>
 <title>Installation of <application>shadow</application></title>
 
-<para>Download the patch for shadow from <ulink url="&patch-root;"/>.</para>
-
 <para>Reinstall shadow by running the following commands:</para>
 
-<screen><userinput><command>LIBS="-lpam -lpam_misc" ./configure --libdir=/usr/lib \
+<screen><userinput><command>patch -Np1 -i ../shadow-&shadow-version;-pam-1.patch &amp;&amp;
+LIBS="-lpam -lpam_misc" ./configure --libdir=/usr/lib \
 --enable-shared --with-libpam &amp;&amp;
 echo '#define HAVE_SETLOCALE 1' >> config.h &amp;&amp;
 make &amp;&amp;
 make install &amp;&amp;
 mv /bin/sg /usr/bin &amp;&amp;
 mv /bin/vigr /usr/sbin &amp;&amp;
+rm /bin/groups &amp;&amp;
 mv /usr/lib/lib{misc,shadow}.so.0* /lib &amp;&amp;
 ln -sf ../../lib/libshadow.so.0 /usr/lib/libshadow.so &amp;&amp;
 ln -sf ../../lib/libmisc.so.0 /usr/lib/libmisc.so</command></userinput></screen>
 
-
 </sect2>
 
diff --git a/postlfs/security/shadow/shadow-intro.xml b/postlfs/security/shadow/shadow-intro.xml
index 857ab25d32..ffbb352b88 100644
--- a/postlfs/security/shadow/shadow-intro.xml
+++ b/postlfs/security/shadow/shadow-intro.xml
@@ -8,6 +8,13 @@ this will allow programs like <command>login</command> and
 <command>su</command> to utilize
 <acronym>PAM</acronym>.</para>
 
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Patch to fix linking against PAM:
+<ulink url="&patch-root;/shadow-&shadow-version;-pam-1.patch"/></para></listitem>
+</itemizedlist>
+</sect3>
+
 <sect3><title><application>Shadow</application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="Linux_PAM"/></para></sect4>
diff --git a/postlfs/security/shadow/shadow.ent b/postlfs/security/shadow/shadow.ent
index 72958c55fb..250190bd29 100644
--- a/postlfs/security/shadow/shadow.ent
+++ b/postlfs/security/shadow/shadow.ent
@@ -3,3 +3,4 @@
 <!ENTITY shadow-inst SYSTEM "shadow-inst.xml">
 <!ENTITY shadow-exp SYSTEM "shadow-exp.xml">
 <!ENTITY shadow-config SYSTEM "shadow-config.xml">
+<!ENTITY shadow-version "4.0.4.1">