Index: book/bookinfo.xml
===================================================================
--- book/bookinfo.xml	(revision cb1ee15f910aa0e3a01be8142ae716387523ca60)
+++ book/bookinfo.xml	(revision f91ceaa0022fb49c1dcba140975399466e32d01d)
@@ -22,5 +22,5 @@
 
   <copyright id="copyright">
-    <year>2001-2006</year>
+    <year>2001-2007</year>
     <holder>BLFS Development Team</holder>
   </copyright>
Index: general.ent
===================================================================
--- general.ent	(revision cb1ee15f910aa0e3a01be8142ae716387523ca60)
+++ general.ent	(revision f91ceaa0022fb49c1dcba140975399466e32d01d)
@@ -1,7 +1,7 @@
-<!ENTITY day          "09">                   <!-- Always 2 digits -->
+<!ENTITY day          "11">                   <!-- Always 2 digits -->
 <!ENTITY month        "01">                   <!-- Always 2 digits -->
 <!ENTITY year         "2007">
 <!ENTITY version      "svn-&year;&month;&day;">
-<!ENTITY releasedate  "December &day;nd, &year;">
+<!ENTITY releasedate  "January &day;th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
@@ -61,5 +61,5 @@
 <!ENTITY tripwire-version             "2.4.0.1">
 <!ENTITY heimdal-version              "0.7.2">
-<!ENTITY mitkrb-version               "1.4.1">
+<!ENTITY mitkrb-version               "1.6">
 <!ENTITY cyrus-sasl-version           "2.1.21">
 <!ENTITY stunnel-version              "4.15">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision cb1ee15f910aa0e3a01be8142ae716387523ca60)
+++ introduction/welcome/changelog.xml	(revision f91ceaa0022fb49c1dcba140975399466e32d01d)
@@ -43,4 +43,15 @@
 
     <listitem>
+      <para>January 11th, 2007</para>
+      <itemizedlist>
+        <listitem>
+          <para>[randy] - Updated to MIT Kerberos V5-1.6. Also overhauled
+          the instructions to fit the updated version and included
+          enhancements to the instructions.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>December 22nd, 2006</para>
       <itemizedlist>
Index: introduction/welcome/credits.xml
===================================================================
--- introduction/welcome/credits.xml	(revision cb1ee15f910aa0e3a01be8142ae716387523ca60)
+++ introduction/welcome/credits.xml	(revision f91ceaa0022fb49c1dcba140975399466e32d01d)
@@ -271,5 +271,6 @@
         Plug-ins, HAL, Heimdal, HTML Tidy, ISO Codes, JadeTeX,
         Java Access Bridge, K3b, LessTif (rewrite), libexif, libgail-gnome,
-        libgnomecups, Libidn, libmpeg2, libmusicbrainz, libquicktime, MPlayer
+        libgnomecups, Libidn, libmpeg2, libmusicbrainz, libquicktime,
+        MIT Kerberos V5 (many updates and enhancements), MPlayer
         (extensive overhaul), NSS, Other Programming Tools, PDL, Perl Modules,
         pilot-link, Poppler, PyXML, Samba 3 (many additions), SANE (original
Index: postlfs/security/mitkrb.xml
===================================================================
--- postlfs/security/mitkrb.xml	(revision cb1ee15f910aa0e3a01be8142ae716387523ca60)
+++ postlfs/security/mitkrb.xml	(revision f91ceaa0022fb49c1dcba140975399466e32d01d)
@@ -5,25 +5,13 @@
   %general-entities;
 
-    <!-- Inserted as a reminder to do this. The mention of a test suite
-         is usually right before the root user installation commands. Please
-         delete these 12 (including one blank) lines after you are done.-->
-
-    <!-- Use one of the two mentions below about a test suite,
-         delete the line that is not applicable. Of course, if the
-         test suite uses syntax other than "make check", revise the
-         line to reflect the actual syntax to run the test suite -->
-
-    <!-- <para>This package does not come with a test suite.</para> -->
-    <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
-
-  <!ENTITY mitkrb-download-http "http://web.mit.edu/kerberos/www/dist/krb5/1.4/krb5-&mitkrb-version;-signed.tar">
+  <!ENTITY mitkrb-download-http "http://web.mit.edu/kerberos/www/dist/krb5/1.6/krb5-&mitkrb-version;-signed.tar">
   <!ENTITY mitkrb-download-ftp " ">
-  <!ENTITY mitkrb-md5sum "617e0071fa5b74ab4116f064678af551">
-  <!ENTITY mitkrb-size "6.4 MB">
-  <!ENTITY mitkrb-buildsize "TBD MB">
-  <!ENTITY mitkrb-time "TBD SBU">
+  <!ENTITY mitkrb-md5sum "a365e39ff7d39639556c2797a0e1c3f4">
+  <!ENTITY mitkrb-size "12.0 MB">
+  <!ENTITY mitkrb-buildsize "124 MB">
+  <!ENTITY mitkrb-time "1.4 SBU">
 ]>
 
-<sect1 id="mitkrb" xreflabel="MIT krb5-&mitkrb-version;">
+<sect1 id="mitkrb" xreflabel="MIT Kerberos V5-&mitkrb-version;">
   <?dbhtml filename="mitkrb.html"?>
 
@@ -33,15 +21,15 @@
   </sect1info>
 
-  <title>MIT Krb5-&mitkrb-version;</title>
+  <title>MIT Kerberos V5-&mitkrb-version;</title>
 
   <indexterm zone="mitkrb">
-    <primary sortas="a-Kerberos-MIT">Kerberos5(MIT)</primary>
+    <primary sortas="a-MIT-Kerberos">MIT Kerberos V5</primary>
   </indexterm>
 
     <sect2 role="package">
-      <title>Introduction to MIT Krb5</title>
-
-    <para><application>MIT krb5</application> is a free implementation of
-    Kerberos 5. Kerberos is a network authentication protocol. It
+      <title>Introduction to MIT Kerberos V5</title>
+
+    <para><application>MIT Kerberos V5</application> is a free implementation
+    of Kerberos 5. Kerberos is a network authentication protocol. It
     centralizes the authentication database and uses kerberized
     applications to work with servers or services that support Kerberos
@@ -71,11 +59,11 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">MIT Krb5 Dependencies</bridgehead>
+    <bridgehead renderas="sect3">MIT Kerberos V5 Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="xinetd"/> (services servers only),
-    <xref linkend="linux-pam"/> (for <command>xdm</command> based logins) and
-    <xref linkend="openldap"/> (alternative for <command>krb5kdc</command>
-    password database)</para>
+    <para role="optional"><xref linkend="linux-pam"/>
+    (for <command>xdm</command> based logins),
+    <xref linkend="openldap"/>, and
+    <xref linkend="dejagnu"/> (required to run the test suite)</para>
 
     <note>
@@ -92,50 +80,62 @@
 
   <sect2 role="installation">
-    <title>Installation of MIT Krb5</title>
-
-
-    <!-- <note><para>The instructions for MIT Krb5 have not yet been validated by
-    the BLFS Editors.  Until this section is updated, the Editors reccomend
-    using <xref linkend='heimdal'/> to implement the functionality of this
-    package.</para></note> -->
-
-
-    <para><application>MIT krb5</application> is distributed in a
+    <title>Installation of MIT Kerberos V5</title>
+
+    <para><application>MIT Kerberos V5</application> is distributed in a
     TAR file containing a compressed TAR package and a detached PGP
-    <filename class="extension">ASC</filename> file.</para>
-
-    <para>If you have installed <xref linkend="gnupg"/>, you can
+    <filename class="extension">ASC</filename> file. You'll need to unpack
+    the distribution tar file, then unpack the compressed tar file before
+    starting the build.</para>
+
+    <para>After unpacking the distribution tarball and if you have
+    <xref linkend="gnupg"/> installed, you can
     authenticate the package with the following command:</para>
 
 <screen><userinput>gpg - -verify krb5-&mitkrb-version;.tar.gz.asc</userinput></screen>
 
-    <para>Build <application>MIT krb5</application> by running the
+    <para>Build <application>MIT Kerberos V5</application> by running the
     following commands:</para>
 
 <screen><userinput>cd src &amp;&amp;
-./configure --prefix=/usr --sysconfdir=/etc \
-    --localstatedir=/var/lib --enable-dns \
-    --enable-static --mandir=/usr/share/man &amp;&amp;
+./configure CPPFLAGS="-I/usr/include/et -I/usr/include/ss" \
+            --prefix=/usr \
+            --sysconfdir=/etc/krb5 \
+            --localstatedir=/var/lib \
+            --with-system-et \
+            --with-system-ss \
+            --enable-dns-for-realm \
+            --mandir=/usr/share/man &amp;&amp;
 make</userinput></screen>
 
+    <para>The regression test suite is designed to be run after the
+    installation has been completed.</para>
+
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>make install &amp;&amp;
+
 mv -v /usr/bin/ksu /bin &amp;&amp;
+chmod -v 755 /bin/ksu &amp;&amp;
 mv -v /usr/lib/libkrb5.so.3* /lib &amp;&amp;
-mv -v /usr/lib/libkrb4.so.2* /lib &amp;&amp;
-mv -v /usr/lib/libdes425.so.3* /lib &amp;&amp;
 mv -v /usr/lib/libk5crypto.so.3* /lib &amp;&amp;
-mv -v /usr/lib/libcom_err.so.3* /lib &amp;&amp;
-ln -v -sf ../../lib/libkrb5.so.3 /usr/lib/libkrb5.so &amp;&amp;
-ln -v -sf ../../lib/libkrb4.so.2 /usr/lib/libkrb4.so &amp;&amp;
-ln -v -sf ../../lib/libdes425.so.3 /usr/lib/libdes425.so &amp;&amp;
-ln -v -sf ../../lib/libk5crypto.so.3 /usr/lib/libk5crypto.so &amp;&amp;
-ln -v -sf ../../lib/libcom_err.so.3 /usr/lib/libcom_err.so &amp;&amp;
-ldconfig</userinput></screen>
+mv -v /usr/lib/libkrb5support.so.0* /lib &amp;&amp;
+
+ln -v -sf ../../lib/libkrb5.so.3.3 /usr/lib/libkrb5.so &amp;&amp;
+ln -v -sf ../../lib/libk5crypto.so.3.1 /usr/lib/libk5crypto.so &amp;&amp;
+ln -v -sf ../../lib/libkrb5support.so.0.1 /usr/lib/libkrb5support.so&amp;&amp;
+
+install -m644 -v ../doc/*.info* /usr/share/info &amp;&amp;
+for INFOFILE in 425 5-admin 5-install 5-user; do
+    install-info --info-dir=/usr/share/info \
+                 /usr/share/info/krb$INFOFILE.info
+    rm ../doc/krb$INFOFILE.info*
+done &amp;&amp;
+
+install -m755 -v -d /usr/share/doc/krb5-&mitkrb-version; &amp;&amp;
+cp -Rv ../doc/* /usr/share/doc/krb5-&mitkrb-version;</userinput></screen>
 
     <warning>
       <para><command>login.krb5</command> does not support
-      <application>shadow</application> passwords. As a result, when the
+      <application>Shadow</application> passwords. As a result, when the
       Kerberos server is unavailable, the default fall through to
       <filename>/etc/password</filename> will not work because
@@ -146,11 +146,25 @@
     </warning>
 
-    <para>If <application>Linux-Pam</application> is not installed and
-    you understand the above warning, the following can be entered as the
-    <systemitem class="username">root</systemitem> user:</para>
+    <para>After considering (and understanding) the above warning, the
+    following commands can be entered as the
+    <systemitem class="username">root</systemitem> user to replace the
+    existing <command>login</command> program with the Kerberized
+    version (after preserving the original) and move the support libraries
+    to a location available when the
+    <filename class='directory'>/usr</filename> filesystem is
+    not mounted:</para>
 
 <screen role="root"><userinput>mv -v /bin/login /bin/login.shadow &amp;&amp;
-cp -v /usr/sbin/login.krb5 /bin/login</userinput></screen>
-
+install -m755 -v /usr/sbin/login.krb5 /bin/login &amp;&amp;
+
+mv -v /usr/lib/libdes425.so.3* /lib &amp;&amp;
+mv -v /usr/lib/libkrb4.so.2* /lib &amp;&amp;
+
+ln -v -sf ../../lib/libdes425.so.3.0 /usr/lib/libdes425.so &amp;&amp;
+ln -v -sf ../../lib/libkrb4.so.2.0 /usr/lib/libkrb4.so &amp;&amp;
+
+ldconfig</userinput></screen>
+
+    <!--
     <para>If <application>CrackLib</application> is installed, or if any
     word list has been put in
@@ -160,4 +174,14 @@
 
 <screen role="root"><userinput>ln -s /usr/share/dict/words /var/lib/krb5kdc/kadmin.dict</userinput></screen>
+    -->
+
+    <para>To test the installation, you must have
+    <xref linkend="dejagnu"/> installed and issue: <command>make
+    check</command>. The RPC layer tests will require a portmap daemon
+    (see <xref linkend="portmap"/>) running and configured to listen on the
+    regular network interface (not localhost). See the <quote>Testing the
+    Build</quote> section of the <filename>krb5-install.html</filename> file
+    in the <filename class='directory'>../doc</filename> directory for complete
+    information on running the regression tests.</para>
 
   </sect2>
@@ -166,36 +190,47 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--enable-dns</parameter>: This switch allows
+    <para><parameter>--enable-dns-for-realm</parameter>: This parameter allows
     realms to be resolved using the DNS server.</para>
 
-    <para><parameter>--enable-static</parameter>: This switch builds static
-    libraries in addition to the shared libraries.</para>
-
-    <para><command>mv -v /bin/login /bin/login.shadow &amp;&amp;
-    cp -v /usr/sbin/login.krb5 /bin/login &amp;&amp;
-    mv -v /usr/bin/ksu /bin</command>: Preserves
-    <application>Shadow</application>'s <command>login</command>
-    command, moves <command>ksu</command> and <command>login</command> to
-    the <filename class="directory">/bin</filename> directory.</para>
+    <para><parameter>--with-system-et</parameter>: This parameter causes the
+    build to use the system-installed versions of the error-table support
+    software.</para>
+
+    <para><parameter>--with-system-ss</parameter>: This parameter causes the
+    build to use the system-installed versions of the subsystem command-line
+    interface software.</para>
+
+    <para><parameter>--localstatedir=/var/lib</parameter>: This parameter is
+    used so that the Kerberos variable run-time data is located in
+    <filename class='directory'>/var/lib</filename> instead of
+    <filename class='directory'>/usr/var</filename>.</para>
+
+    <!-- <para><parameter>- -enable-static</parameter>: This switch builds static
+    libraries in addition to the shared libraries.</para> -->
+
+    <para><command>mv -v /usr/bin/ksu /bin</command>: Moves the
+    <command>ksu</command> program to the
+    <filename class="directory">/bin</filename> directory so that it is
+    available when the <filename class="directory">/usr</filename>
+    filesystem is not mounted.</para>
 
     <para><command>mv -v ... /lib &amp;&amp; ln -v -sf ...</command>:
-    The <command>login</command> and <command>ksu</command> programs
-    are linked against these libraries, therefore these libraries are moved
-    to <filename class="directory">/lib</filename> to allow logins without
-    mounting <filename class="directory">/usr</filename>.</para>
+    These libraries are moved to <filename class="directory">/lib</filename> so
+    they are available when the <filename class="directory">/usr</filename>
+    filesystem is not mounted.</para>
 
   </sect2>
 
   <sect2 role="configuration">
-    <title>Configuring MIT Krb5</title>
+    <title>Configuring MIT Kerberos V5</title>
 
     <sect3 id="krb5-config">
       <title>Config Files</title>
 
-      <para><filename>/etc/krb5.conf</filename> and
+      <para><filename>/etc/krb5/krb5.conf</filename> and
       <filename>/var/lib/krb5kdc/kdc.conf</filename></para>
 
       <indexterm zone="mitkrb krb5-config">
-        <primary sortas="e-etc-krb5.conf">/etc/krb5.conf</primary>
+        <primary sortas="e-etc-krb5-krb5.conf">/etc/krb5/krb5.conf</primary>
       </indexterm>
 
@@ -212,9 +247,21 @@
         <title>Kerberos Configuration</title>
 
+        <tip>
+          <para>You should consider installing some sort of password checking
+          dictionary so that you can configure the installation to only
+          accept strong passwords. A suitable dictionary to use is shown in
+          the <xref linkend="cracklib"/> instructions. Note that only one
+          file can be used, but you can concatenate many files into one. The
+          configuration file shown below assumes you have installed a
+          dictionary to <filename>/usr/share/dict/words</filename>.</para>
+        </tip>
+
         <para>Create the Kerberos configuration file with the following
-        command:</para>
-
-<screen role="root"><userinput>cat &gt; /etc/krb5.conf &lt;&lt; "EOF"
-<literal># Begin /etc/krb5.conf
+        commands issued by the <systemitem class="username">root</systemitem>
+        user:</para>
+
+<screen role="root"><userinput>install -v -m755 -d /etc/krb5 &amp;&amp;
+cat &gt; /etc/krb5/krb5.conf &lt;&lt; "EOF"
+<literal># Begin /etc/krb5/krb5.conf
 
 [libdefaults]
@@ -226,4 +273,5 @@
         kdc = <replaceable>&lt;belgarath.lfs.org&gt;</replaceable>
         admin_server = <replaceable>&lt;belgarath.lfs.org&gt;</replaceable>
+        dict_file = /usr/share/dict/words
     }
 
@@ -236,5 +284,5 @@
     default = SYSLOG[[:SYS]]
 
-# End /etc/krb5.conf</literal>
+# End /etc/krb5/krb5.conf</literal>
 EOF</userinput></screen>
 
@@ -282,5 +330,5 @@
 
         <para>This should have created a file in
-        <filename class="directory">/etc</filename> named
+        <filename class="directory">/etc/krb5</filename> named
         <filename>krb5.keytab</filename> (Kerberos 5). This file should
         have 600 (<systemitem class="username">root</systemitem> rw only)
@@ -318,5 +366,5 @@
 
 <screen><userinput>ktutil
-<prompt>ktutil:</prompt> rkt /etc/krb5.keytab
+<prompt>ktutil:</prompt> rkt /etc/krb5/krb5.keytab
 <prompt>ktutil:</prompt> l</userinput></screen>
 
@@ -372,5 +420,5 @@
 
         <para>For additional information consult <ulink
-        url="http://web.mit.edu/kerberos/www/krb5-1.4/#documentation">
+        url="http://web.mit.edu/kerberos/www/krb5-1.6/#documentation">
         Documentation for krb-&mitkrb-version;</ulink> on which the above
         instructions are based.</para>
@@ -392,14 +440,17 @@
 
       <seglistitem>
-        <seg>compile-et, ftp, ftpd, gss-client, gss-server, k5srvutil, kadmin,
-        kadmin.local, kadmind, kadmind4, kdb5_util, kdestroy, kinit, klist,
-        klogind, kpasswd, kprop, kpropd, krb5-send-pr, krb5-config, krb524d,
+        <seg>ftp, ftpd, gss-client, gss-server, k5srvutil, kadmin,
+        kadmin.local, kadmind, kdb5_ldap_util, kdb5_util, kdestroy, kinit, klist,
+        klogind, kpasswd, kprop, kpropd, krb5-config, krb5-send-pr, krb524d,
         krb524init, krb5kdc, kshd, ksu, ktutil, kvno, login.krb5, rcp, rlogin,
         rsh, sclient, sim_client, sim_server, sserver, telnet, telnetd,
-        uuclient, uuserver, v5passwd, and v5passwdd</seg>
-        <seg>libcom_err.{so,a}, libdes425.{so,a}, libgssapi.{so,a},
-        libgssrpc.{so,a}, libkadm5clnt.{so,a}, libkadm5srv.{so,a},
-        libkdb5.{so,a}, libkrb5.{so,a}, and libkrb4.{so,a}</seg>
-        <seg>/usr/include/kerberosIV and /var/lib/krb5kdc</seg>
+        uuclient, uuserver and v4rcp</seg>
+        <seg>libdes425.so, libgssapi_krb5.so,
+        libgssrpc.so, libk5crypto.so, libkadm5clnt.so, libkadm5srv.so,
+        libkdb5.so, libkdb_ldap.so, libkrb4.so, libkrb5.so and
+        libkrb5support.so</seg>
+        <seg>/etc/krb5, /usr/include/{gssapi,gssrpc,kerberosIV,krb5},
+        /usr/lib/krb5, /usr/share/{doc/krb5-&mitkrb-version;,examples,gnats}
+        and /var/lib/krb5kdc</seg>
       </seglistitem>
     </segmentedlist>
@@ -410,20 +461,9 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="compile_et">
-        <term><command>compile_et</command></term>
-        <listitem>
-          <para>converts the table listing error-code names into a
-          C source file.</para>
-          <indexterm zone="mitkrb compile_et">
-            <primary sortas="b-compile_et">compile_et</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="ftp-mitkrb">
         <term><command>ftp</command></term>
         <listitem>
           <para>is a kerberized FTP client.</para>
-          <indexterm zone="mitkrb ftp">
+          <indexterm zone="mitkrb ftp-mitkrb">
             <primary sortas="b-ftp">ftp</primary>
           </indexterm>
@@ -435,5 +475,5 @@
         <listitem>
           <para>is a kerberized FTP daemon.</para>
-          <indexterm zone="mitkrb ftpd">
+          <indexterm zone="mitkrb ftpd-mitkrb">
             <primary sortas="b-ftpd">ftpd</primary>
           </indexterm>
@@ -559,11 +599,11 @@
       </varlistentry>
 
-      <varlistentry id="krb5-config-1">
+      <varlistentry id="krb5-config-prog2">
         <term><command>krb5-config</command></term>
         <listitem>
           <para>gives information on how to link programs against
           libraries.</para>
-          <indexterm zone="mitkrb krb5-config-prog">
-            <primary sortas="b-krb5-config-1">krb5-config</primary>
+          <indexterm zone="mitkrb krb5-config-prog2">
+            <primary sortas="b-krb5-config">krb5-config</primary>
           </indexterm>
         </listitem>
@@ -639,5 +679,5 @@
         <listitem>
           <para>is a kerberized rcp client program.</para>
-          <indexterm zone="mitkrb rcp">
+          <indexterm zone="mitkrb rcp-mitkrb">
             <primary sortas="b-rcp">rcp</primary>
           </indexterm>
@@ -659,5 +699,5 @@
         <listitem>
           <para>is a kerberized rsh client program.</para>
-          <indexterm zone="mitkrb rsh">
+          <indexterm zone="mitkrb rsh-mitkrb">
             <primary sortas="b-rsh">rsh</primary>
           </indexterm>
@@ -669,5 +709,5 @@
         <listitem>
           <para>is a kerberized telnet client program.</para>
-          <indexterm zone="mitkrb telnet">
+          <indexterm zone="mitkrb telnet-mitkrb">
             <primary sortas="b-telnet">telnet</primary>
           </indexterm>
@@ -679,5 +719,5 @@
         <listitem>
           <para>is a kerberized telnet server.</para>
-          <indexterm zone="mitkrb telnetd">
+          <indexterm zone="mitkrb telnetd-mitkrb">
             <primary sortas="b-telnetd">telnetd</primary>
           </indexterm>
@@ -685,16 +725,6 @@
       </varlistentry>
 
-      <varlistentry id="libcom_err">
-        <term><filename class='libraryfile'>libcom_err.{so,a}</filename></term>
-        <listitem>
-          <para>implements the Kerberos library error code.</para>
-          <indexterm zone="mitkrb libcom_err">
-            <primary sortas="c-libcom_err">libcom_err.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgssapi-mitkrb">
-        <term><filename class='libraryfile'>libgssapi.{so,a}</filename></term>
+      <varlistentry id="libgssapi_krb5-mitkrb">
+        <term><filename class='libraryfile'>libgssapi_krb5.so</filename></term>
         <listitem>
           <para>contain the Generic Security Service Application
@@ -703,6 +733,6 @@
           underlying mechanisms and technologies and hence allowing source-level
           portability of applications to different environments.</para>
-          <indexterm zone="mitkrb libgssapi">
-            <primary sortas="c-libgssapi">libgssapi.{so,a}</primary>
+          <indexterm zone="mitkrb libgssapi_krb5-mitkrb">
+            <primary sortas="c-libgssapi_krb5">libgssapi_krb5.so</primary>
           </indexterm>
         </listitem>
@@ -710,10 +740,10 @@
 
       <varlistentry id="libkadm5clnt-mitkrb">
-        <term><filename class='libraryfile'>libkadm5clnt.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libkadm5clnt.so</filename></term>
         <listitem>
           <para>contains the administrative authentication and password
           checking functions required by Kerberos 5 client-side programs.</para>
-          <indexterm zone="mitkrb libkadm5clnt">
-            <primary sortas="c-libkadm5clnt">libkadm5clnt.{so,a}</primary>
+          <indexterm zone="mitkrb libkadm5clnt-mitkrb">
+            <primary sortas="c-libkadm5clnt">libkadm5clnt.so</primary>
           </indexterm>
         </listitem>
@@ -721,10 +751,10 @@
 
       <varlistentry id="libkadm5srv-mitkrb">
-        <term><filename class='libraryfile'>libkadm5srv.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libkadm5srv.so</filename></term>
         <listitem>
           <para>contain the administrative authentication and password
           checking functions required by Kerberos 5 servers.</para>
-          <indexterm zone="mitkrb libkadm5srv">
-            <primary sortas="c-libkadm5srv">libkadm5srv.{so,a}</primary>
+          <indexterm zone="mitkrb libkadm5srv-mitkrb">
+            <primary sortas="c-libkadm5srv">libkadm5srv.so</primary>
           </indexterm>
         </listitem>
@@ -732,10 +762,10 @@
 
       <varlistentry id="libkdb5">
-        <term><filename class='libraryfile'>libkdb5.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libkdb5.so</filename></term>
         <listitem>
           <para>is a Kerberos 5 authentication/authorization database
           access library.</para>
           <indexterm zone="mitkrb libkdb5">
-            <primary sortas="c-libkdb5">libkdb5.{so,a}</primary>
+            <primary sortas="c-libkdb5">libkdb5.so</primary>
           </indexterm>
         </listitem>
@@ -743,9 +773,9 @@
 
       <varlistentry id="libkrb5-mitkrb">
-        <term><filename class='libraryfile'>libkrb5.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libkrb5.so</filename></term>
         <listitem>
           <para>is an all-purpose Kerberos 5 library.</para>
-          <indexterm zone="mitkrb libkrb5">
-            <primary sortas="c-libkrb5">libkrb5.{so,a}</primary>
+          <indexterm zone="mitkrb libkrb5-mitkrb">
+            <primary sortas="c-libkrb5">libkrb5.so</primary>
           </indexterm>
         </listitem>
