diff --git a/doc/heimdal.texi b/doc/heimdal.texi
index f941e8684..8f6ccf8f9 100644
--- a/doc/heimdal.texi
+++ b/doc/heimdal.texi
@@ -25,8 +25,8 @@
 @titlepage
 @title Heimdal
 @subtitle Kerberos 5 from KTH
-@subtitle Edition 0.0, for version 0.0h
-@subtitle 1997
+@subtitle Edition 0.0, for version 0.0o
+@subtitle 1998
 @author Johan Danielsson
 @author Assar Westerlund
 @author last updated $Date$
@@ -36,7 +36,7 @@
 @def@copyrightend{}
 @page
 @copyrightstart
-Copyright (c) 1997 Kungliga Tekniska Högskolan 
+Copyright (c) 1997, 1998 Kungliga Tekniska Högskolan 
 (Royal Institute of Technology, Stockholm, Sweden).
 All rights reserved.
 
@@ -224,25 +224,16 @@ to the following restrictions:
 * What is Kerberos?::           
 * Building and Installing::     
 * Setting up a realm::          
+* Things in search for a better place::  
 * Kerberos 4 issues::           
 * Acknowledgments::             
-
- --- The Detailed Node Listing ---
-
-Building and Installing
-
-* Finishing the installation::  
-
-Kerberos 4 issues
-
-* Principal conversion issues::  
-* Converting a version 4 database::  
 @end menu
 
 @include intro.texi
 @include whatis.texi
 @include install.texi
 @include setup.texi
+@include misc.texi
 @include kerberos4.texi
 @include ack.texi
 
diff --git a/doc/kerberos4.texi b/doc/kerberos4.texi
index 7158ed0ce..673430332 100644
--- a/doc/kerberos4.texi
+++ b/doc/kerberos4.texi
@@ -1,4 +1,4 @@
-@node Kerberos 4 issues, Acknowledgments, Setting up a realm, Top
+@node Kerberos 4 issues, Acknowledgments, Things in search for a better place, Top
 @comment  node-name,  next,  previous,  up
 @chapter Kerberos 4 issues
 
diff --git a/doc/setup.texi b/doc/setup.texi
index 1dba20a27..5a8b747d0 100644
--- a/doc/setup.texi
+++ b/doc/setup.texi
@@ -1,4 +1,4 @@
-@node Setting up a realm, Kerberos 4 issues, Building and Installing, Top
+@node Setting up a realm, Things in search for a better place, Building and Installing, Top
 @chapter Setting up a realm
 
 A