diff --git a/doc/ChangeLog b/doc/ChangeLog
index 47ba099d..635d9616 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+1998-08-11  Martin Baulig  <martin@home-of-linux.org>
+
+	* gnome-hackers.sgml: Updated documentation.
+	* autoconf.sgml: New file, included from `gnome-hackers.sgml'.
+
 1998-07-21  Martin Baulig  <martin@home-of-linux.org>
 
 	* gnome-hackers.sgml: Added note that this file is
diff --git a/doc/Makefile b/doc/Makefile
index 8d406a01..b95a67c6 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -12,7 +12,7 @@ clean:
 		-V %no-make-index% libgtop.sgml > /dev/null && \
 		touch .timestamp
 
-.timestamp2:	gnome-hackers.sgml autoconf.sgml
+.timestamp2:	gnome-hackers.sgml autoconf.sgml ../guile/reference.sgml
 	-rm -rf gnome-hackers
 	mkdir gnome-hackers
 	-rm -f .timestamp2
diff --git a/doc/gnome-hackers.sgml b/doc/gnome-hackers.sgml
index 3132b708..474dde8a 100644
--- a/doc/gnome-hackers.sgml
+++ b/doc/gnome-hackers.sgml
@@ -1,12 +1,51 @@
 <!-- $Id$ -->
 
 <!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-<!entity example-libgtopConf-sh SYSTEM "libgtopConf.sh">
-<!entity autoconf.sgml SYSTEM "autoconf.sgml">
+<!-- Site-specific entities, change them if you want to copy this
+     document somewhere else. -->
 <!entity home-of-linux "http://www.home-of-linux.org/">
+
+<!-- Some general entities -->
+
+<!entity libgtop "<productname>libgtop</productname>">
+
+<!-- Some abbreviations for often used filenames. -->
+
 <!entity gnome-libgtop-check.m4 "<filename>macros/gnome-libgtop-check.m4</filename>">
 <!entity libgtopConf.sh "<filename>libgtopConf.sh</filename>">
-<!entity libgtop "<productname>libgtop</productname>">
+
+<!-- This will include a sample `libgtopConf.sh'. -->
+
+<!entity example-libgtopConf-sh SYSTEM "libgtopConf.sh">
+
+<!-- Some entities to include other files. -->
+
+<!entity include-autoconf.sgml SYSTEM "autoconf.sgml">
+<!entity include-reference.sgml SYSTEM "../guile/reference.sgml">
+
+<!-- The following entities are used in the automatically generated
+     `reference.sgml' to include custom descriptions of the features.
+  -->
+
+<!entity include-cpu.sgml "">
+<!entity include-mem.sgml "">
+<!entity include-swap.sgml "">
+<!entity include-uptime.sgml "">
+<!entity include-loadavg.sgml "">
+<!entity include-shm-limits.sgml "">
+<!entity include-msg-limits.sgml "">
+<!entity include-sem-limits.sgml "">
+<!entity include-proclist.sgml "">
+<!entity include-proc-state.sgml "">
+<!entity include-proc-uid.sgml "">
+<!entity include-proc-mem.sgml "">
+<!entity include-proc-time.sgml "">
+<!entity include-proc-signal.sgml "">
+<!entity include-proc-kernel.sgml "">
+<!entity include-proc-segment.sgml "">
+<!entity include-proc-map.sgml "">
+<!entity include-mountlist.sgml "">
+<!entity include-fsusage.sgml "">
 ]>
 <book>
   <bookinfo>
@@ -90,8 +129,16 @@
   <chapter id="autoconf-automake">
     <title>Configuration</title>
 
-    &autoconf.sgml;
+    &include-autoconf.sgml;
 
+  </chapter>
+
+  <chapter id="functions">
+    <title>Function Reference List</title>
+    
+    &include-reference.sgml;
+
+  </chapter>
     
 </book>
 
diff --git a/doc/libgtop-ref.sgml b/doc/libgtop-ref.sgml
index 93e645c2..dcf55133 100644
--- a/doc/libgtop-ref.sgml
+++ b/doc/libgtop-ref.sgml
@@ -1,7 +1,31 @@
 <!-- $Id$ -->
 
 <!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-<!entity reference.sgml SYSTEM "../guile/reference.sgml" >
+<!entity include-reference.sgml SYSTEM "../guile/reference.sgml" >
+
+<!-- The following entities are used in the automatically generated
+     `reference.sgml' to include custom descriptions of the features.
+  -->
+
+<!entity include-cpu.sgml "">
+<!entity include-mem.sgml "">
+<!entity include-swap.sgml "">
+<!entity include-uptime.sgml "">
+<!entity include-loadavg.sgml "">
+<!entity include-shm-limits.sgml "">
+<!entity include-msg-limits.sgml "">
+<!entity include-sem-limits.sgml "">
+<!entity include-proclist.sgml "">
+<!entity include-proc-state.sgml "">
+<!entity include-proc-uid.sgml "">
+<!entity include-proc-mem.sgml "">
+<!entity include-proc-time.sgml "">
+<!entity include-proc-signal.sgml "">
+<!entity include-proc-kernel.sgml "">
+<!entity include-proc-segment.sgml "">
+<!entity include-proc-map.sgml "">
+<!entity include-mountlist.sgml "">
+<!entity include-fsusage.sgml "">
 ]>
 <book>
   <bookinfo>
@@ -22,9 +46,11 @@
 	<literal>$Id$</literal>
 
       <para>
-	This reference manual is automatically generated from <filename>doc/make-docbook.scm</filename>.
-	It uses the guile interface of <productname>libgtop</productname> to get the names of all
-	features the library defines and a description of the structures.
+	This reference manual is automatically generated from
+	<filename>doc/make-docbook.scm</filename>. It uses the
+	guile interface of <productname>libgtop</productname> to
+	get the names of all features the library defines and a
+	description of the structures.
     </abstract>
 
     <copyright>
@@ -62,6 +88,21 @@
   
   <toc></toc>
   
-    &reference.sgml;
+  <chapter id="functions">
+    <title>Function Reference List</title>
+    
+    &include-reference.sgml;
 
 </book>
+
+<!--
+  Local Variables:
+  mode: sgml
+  sgml-omittag:t
+  sgml-shorttag:t
+  sgml-minimize-attributes:nil
+  sgml-always-quote-attributes:t
+  sgml-indent-step:2
+  sgml-indent-data: t
+  End:
+ -->