Index: basicnet/netprogs/ntp.xml
===================================================================
--- basicnet/netprogs/ntp.xml	(revision 965649599a1b319ce387f4973b50be2fe5ea8013)
+++ basicnet/netprogs/ntp.xml	(revision 619dd53db6d4a890d3d9452ff117dce1540c86c7)
@@ -1,3 +1,3 @@
-<sect1 id="ntp" xreflabel="ntp-&ntp-version;">
+<sect1 id="ntp" xreflabel="NTP-&ntp-version;">
 <?dbhtml filename="ntp.html" dir="basicnet"?>
 <title>NTP-&ntp-version;</title>
@@ -9,3 +9,2 @@
 
 </sect1>
-
Index: postlfs/security/heimdal/heimdal-config.xml
===================================================================
--- postlfs/security/heimdal/heimdal-config.xml	(revision 965649599a1b319ce387f4973b50be2fe5ea8013)
+++ postlfs/security/heimdal/heimdal-config.xml	(revision 619dd53db6d4a890d3d9452ff117dce1540c86c7)
@@ -8,23 +8,26 @@
 <sect3><title>Configuration Information</title>
 
+<sect4><title>Master KDC Server Configuration</title>
+
 <para>
 Create the Kerberos configuration file with the following command:
 </para>
 
-<screen><userinput><command>cat > /etc/heimdal/krb5.conf << "EOF"</command>
+<screen><userinput><command>mkdir /etc/heimdal &amp;&amp;
+cat > /etc/heimdal/krb5.conf << "EOF"</command>
 # Begin /etc/heimdal/krb5.conf
         
 [libdefaults]
-    default_realm = LFS.ORG
+    default_realm = <replaceable>[LFS.ORG]</replaceable>
     encrypt = true
 
 [realms]
-    LFS.ORG = {
-        kdc = belgarath.lfs.org
-        admin_server = belgarath.lfs.org
+    <replaceable>[LFS.ORG]</replaceable> = {
+        kdc = <replaceable>[belgarath.lfs.org]</replaceable>
+        admin_server = <replaceable>[belgarath.lfs.org]</replaceable>
     }
 
 [domain_realm]
-    .lfs.org = LFS.ORG
+    .<replaceable>[lfs.org]</replaceable> = <replaceable>[LFS.ORG]</replaceable>
 
 [logging]
@@ -82,5 +85,5 @@
 </para>
 
-<screen><userinput><command>init LFS.ORG</command></userinput></screen>
+<screen><userinput><command>init <replaceable>[LFS.ORG]</replaceable></command></userinput></screen>
 
 <para>
@@ -89,5 +92,5 @@
 </para>
 
-<screen><userinput><command>add loginname</command></userinput></screen>
+<screen><userinput><command>add <replaceable>[loginname]</replaceable></command></userinput></screen>
 
 <para>
@@ -96,5 +99,5 @@
 </para>
 
-<screen><userinput><command>add --random-key host/belgarath.lfs.org</command></userinput></screen>
+<screen><userinput><command>add --random-key host/<replaceable>[belgarath.lfs.org]</replaceable></command></userinput></screen>
 
 <para>
@@ -103,5 +106,5 @@
 </para>
 
-<screen><userinput><command>ext host/belgarath.lfs.org</command></userinput></screen>
+<screen><userinput><command>ext host/<replaceable>[belgarath.lfs.org]</replaceable></command></userinput></screen>
 
 <para>
@@ -120,5 +123,5 @@
 </para>
 
-<screen><userinput><command>add --random-key ftp/belgarath.lfs.org</command></userinput></screen>
+<screen><userinput><command>add --random-key ftp/<replaceable>[belgarath.lfs.org]</replaceable></command></userinput></screen>
 
 <para>
@@ -126,5 +129,5 @@
 </para>
 
-<screen><userinput><command>ext ftp/belgarath.lfs.org</command></userinput></screen>
+<screen><userinput><command>ext ftp/<replaceable>[belgarath.lfs.org]</replaceable></command></userinput></screen>
 
 <para>
@@ -141,5 +144,5 @@
 </para>
 
-<screen><userinput><command>kinit loginname</command></userinput></screen>
+<screen><userinput><command>kinit <replaceable>[loginname]</replaceable></command></userinput></screen>
 
 <para>
@@ -177,4 +180,6 @@
 <screen><userinput><command>make install-heimdal</command></userinput></screen>
 
+</sect4>
+
 </sect3>
 
Index: postlfs/security/heimdal/heimdal-exp.xml
===================================================================
--- postlfs/security/heimdal/heimdal-exp.xml	(revision 965649599a1b319ce387f4973b50be2fe5ea8013)
+++ postlfs/security/heimdal/heimdal-exp.xml	(revision 619dd53db6d4a890d3d9452ff117dce1540c86c7)
@@ -24,10 +24,10 @@
 <screen><command>mv /bin/login /bin/login.shadow
 mv /bin/su /bin/su.coreutils
-cp /usr/bin/login /bin
-mv /usr/bin/su /bin</command></screen>
+mv /usr/bin/{login,su} /bin
+ln -sf ../../bin/login /usr/bin</command></screen>
 The <command>login</command> and <command>su</command> programs
 installed by Heimdal belong in <filename
 class="directory">/bin</filename> directory. The
-<command>login</command> program is copied because Heimdal is expecting
+<command>login</command> program is symlinked because Heimdal is expecting
 to find it in <filename class="directory">/usr/bin</filename>. We
 preserve the old executables before the move to keep things sane should
@@ -36,8 +36,8 @@
 
 <para>
-<screen><command>mv /usr/lib/lib{otp.so.0,otp.so.0.1.4,kafs.so.0,kafs.so.0.4.0} /usr/lib
-mv /usr/lib/lib{krb5.so.17,krb5.so.17.3.0,asn1.so.6,asn1.so.6.0.2} /usr/lib
-mv /usr/lib/lib{roken.so.16,roken.so.16.0.3,crypto.so.0.9.7} /usr/lib
-mv /usr/lib/lib{com_err.so.1,com_err.so.1.1.1,db-4.1.so} /usr/lib
+<screen><command>mv /usr/lib/lib{otp.so.0,otp.so.0.1.4,kafs.so.0,kafs.so.0.4.0} /lib
+mv /usr/lib/lib{krb5.so.17,krb5.so.17.3.0,asn1.so.6,asn1.so.6.0.2} /lib
+mv /usr/lib/lib{roken.so.16,roken.so.16.0.3,crypto.so.0.9.7} /lib
+mv /usr/lib/lib{com_err.so.1,com_err.so.1.1.1,db-4.1.so} /lib
 ln -sf ../../lib/lib{otp.so.0,otp.so.0.1.4,kafs.so.0,kafs.so.0.4.0} /usr/lib
 ln -sf ../../lib/lib{krb5.so.17,krb5.so.17.3.0,asn1.so.6,asn1.so.6.0.2} /usr/lib
Index: postlfs/security/heimdal/heimdal-inst.xml
===================================================================
--- postlfs/security/heimdal/heimdal-inst.xml	(revision 965649599a1b319ce387f4973b50be2fe5ea8013)
+++ postlfs/security/heimdal/heimdal-inst.xml	(revision 619dd53db6d4a890d3d9452ff117dce1540c86c7)
@@ -24,14 +24,15 @@
 mv /bin/login /bin/login.shadow &amp;&amp;
 mv /bin/su /bin/su.coreutils &amp;&amp;
-cp /usr/bin/login /bin &amp;&amp;
-mv /usr/bin/su /bin &amp;&amp;
-mv /usr/lib/lib{otp.so.0,otp.so.0.1.4,kafs.so.0,kafs.so.0.4.0} /usr/lib &amp;&amp;
-mv /usr/lib/lib{krb5.so.17,krb5.so.17.3.0,asn1.so.6,asn1.so.6.0.2} /usr/lib &amp;&amp;
-mv /usr/lib/lib{roken.so.16,roken.so.16.0.3,crypto.so.0.9.7} /usr/lib &amp;&amp;
-mv /usr/lib/lib{com_err.so.1,com_err.so.1.1.1,db-4.1.so} /usr/lib &amp;&amp;
+mv /usr/bin/{login,su} /bin &amp;&amp;
+ln -sf ../../bin/login /usr/bin &amp;&amp;
+mv /usr/lib/lib{otp.so.0,otp.so.0.1.4,kafs.so.0,kafs.so.0.4.0} /lib &amp;&amp;
+mv /usr/lib/lib{krb5.so.17,krb5.so.17.3.0,asn1.so.6,asn1.so.6.0.2} /lib &amp;&amp;
+mv /usr/lib/lib{roken.so.16,roken.so.16.0.3,crypto.so.0.9.7} /lib &amp;&amp;
+mv /usr/lib/lib{com_err.so.1,com_err.so.1.1.1,db-4.1.so} /lib &amp;&amp;
 ln -sf ../../lib/lib{otp.so.0,otp.so.0.1.4,kafs.so.0,kafs.so.0.4.0} /usr/lib &amp;&amp;
 ln -sf ../../lib/lib{krb5.so.17,krb5.so.17.3.0,asn1.so.6,asn1.so.6.0.2} /usr/lib &amp;&amp;
 ln -sf ../../lib/lib{roken.so.16,roken.so.16.0.3,crypto.so.0.9.7} /usr/lib &amp;&amp;
-ln -sf ../../lib/lib{com_err.so.1,com_err.so.1.1.1,db-4.1.so} /usr/lib</command></userinput></screen>
+ln -sf ../../lib/lib{com_err.so.1,com_err.so.1.1.1,db-4.1.so} /usr/lib &amp;&amp;
+ldconfig</command></userinput></screen>
 
 </sect2>
Index: postlfs/security/heimdal/heimdal-intro.xml
===================================================================
--- postlfs/security/heimdal/heimdal-intro.xml	(revision 965649599a1b319ce387f4973b50be2fe5ea8013)
+++ postlfs/security/heimdal/heimdal-intro.xml	(revision 619dd53db6d4a890d3d9452ff117dce1540c86c7)
@@ -43,8 +43,18 @@
 <xref linkend="tcpwrappers"/>,
 <xref linkend="readline"/>,
-<xref linkend="Linux_PAM"/> and
+<xref linkend="Linux_PAM"/>,
 <xref linkend="xorg"/> or
-<xref linkend="xfree86"/>
-</para></sect4>
+<xref linkend="xfree86"/>,
+<xref linkend="openldap"/> and
+<ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>
+</para>
+
+<note><para>
+Some sort of time synchronization facility on your system (like <xref
+linkend="ntp"/>) is required since Kerberos won't authenticate if the
+time differential between a kerberized client and the
+<acronym>KDC</acronym> server is more than 5 minutes.</para></note> 
+</sect4>
+
 </sect3>
 
