diff --git a/doc/.cvsignore b/doc/.cvsignore
index 546d7293..b5e570d5 100644
--- a/doc/.cvsignore
+++ b/doc/.cvsignore
@@ -1,10 +1,8 @@
-*.shml
-*.ced
-.timestamp
-.timestamp2
-.timestamp3
-.timestamp4
+Makefile.in
+Makefile
 gnome-hackers
 libgtop
 libgtop-ref
 table
+*.ced
+*.fot
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 378ea7cf..2882b812 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,10 @@
+1998-10-12  Martin Baulig  <martin@home-of-linux.org>
+
+	* Makefile.am: New file. We are now using automake here.
+	* libgtopConf.sh: Removed. Since libgtop-docu now requires
+ 	LibGTop to be installed we use the installed version of this file.
+	* Makefile: Removed.
+
 1998-08-12  Martin Baulig  <martin@home-of-linux.org>
 
 	* features: New directory.
diff --git a/doc/Makefile b/doc/Makefile
deleted file mode 100644
index 00c09935..00000000
--- a/doc/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-all:	.timestamp .timestamp2 .timestamp3 .timestamp4
-
-clean:
-	-rm -f .timestamp*
-	-rm -rf libgtop gnome-hackers libgtop-ref table
-
-.timestamp:	libgtop.sgml
-	-rm -rf libgtop
-	mkdir libgtop
-	-rm -f .timestamp
-	jade -D /usr/lib/sgml -d libgtop.dsl -t sgml \
-		-V %no-make-index% libgtop.sgml > /dev/null && \
-		touch .timestamp
-
-.timestamp2:	gnome-hackers.sgml autoconf.sgml ../guile/reference.sgml \
-	features/uptime.sgml features/uptime.txt features/proclist.sgml \
-	features/procmem.sgml
-	-rm -rf gnome-hackers
-	mkdir gnome-hackers
-	-rm -f .timestamp2
-	jade -D /usr/lib/sgml -d gnome-hackers.dsl -t sgml \
-		-V %no-make-index% gnome-hackers.sgml > /dev/null && \
-		touch .timestamp2
-
-.timestamp3:	libgtop-ref.sgml ../guile/reference.sgml
-	-rm -rf libgtop-ref
-	mkdir libgtop-ref
-	-rm -f .timestamp3
-	jade -D /usr/lib/sgml -d libgtop-ref.dsl -t sgml \
-		-V %no-make-index% libgtop-ref.sgml > /dev/null && \
-		touch .timestamp3
-
-.timestamp4:	table.sgml
-	-rm -rf table
-	mkdir table
-	-rm -f .timestamp4
-	jade -D /usr/lib/sgml -d table.dsl -t sgml \
-		-V %no-make-index% table.sgml > /dev/null && \
-		touch .timestamp4
diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644
index 00000000..79a85c62
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1,53 @@
+htmldir		= $(prefix)/html
+
+html_subdirs	= libgtop gnome-hackers libgtop-ref table
+
+# Well, yes - you are using GNU Make, aren't you ... ?
+stamp_FILES	= $(addsuffix .stamp,$(html_subdirs))
+sgml_FILES	= $(addsuffix .sgml,$(html_subdirs))
+dsl_FILES	= $(addsuffix .dsl,$(html_subdirs))
+
+EXTRA_DIST	= $(sgml_FILES) $(dsl_FILES) dbtohtml.dsl autoconf.sgml
+
+noinst_DATA	= $(stamp_FILES)
+
+CLEANFILES	= $(stamp_FILES)
+
+distclean-local:
+	-rm -rf $(html_subdirs)
+
+libgtop.sgml: libgtopConf.sh
+
+gnome-hackers.sgml: autoconf.sgml $(top_builddir)/guile/reference.sgml \
+	features/uptime.sgml features/uptime.txt features/proclist.sgml \
+	features/procmem.sgml
+
+libgtopConf.sh:
+	@LN_S@ `@LIBGTOP_CONFIG@ --config`
+
+# You can set the $(JADE_FLAGS) in your shell to pass additional
+# arguments like `-D /usr/lib/sgml' to jade.
+
+SUFFIXES = .stamp .sgml
+.sgml.stamp:
+	echo rm -f $@
+	-rm -rf $*
+	mkdir $*
+	jade $(JADE_FLAGS) -D $(srcdir) -D . -D $(top_builddir)/guile \
+		-d $(srcdir)/$*.dsl -t sgml -V %no-make-index% $< \
+		> /dev/null && touch $@
+
+install-data-local:
+	$(mkinstalldirs) $(htmldir)
+	for subdir in $(html_subdirs) ; do \
+	  $(mkinstalldirs) $(htmldir)/$$subdir ; \
+	  for file in $$subdir/* ; do \
+	    $(INSTALL_DATA) $$file $(htmldir)/$$subdir ; \
+	  done \
+	done
+
+dist-hook:
+	mkdir $(distdir)/features
+	cp -p $(srcdir)/features/*.sgml $(distdir)/features
+	cp -p $(srcdir)/features/*.txt $(distdir)/features
+
diff --git a/doc/gnome-hackers.sgml b/doc/gnome-hackers.sgml
index 9b0b03a4..eabe0f73 100644
--- a/doc/gnome-hackers.sgml
+++ b/doc/gnome-hackers.sgml
@@ -31,7 +31,7 @@
 <!-- Some entities to include other files. -->
 
 <!entity include-autoconf.sgml SYSTEM "autoconf.sgml">
-<!entity include-reference.sgml SYSTEM "../guile/reference.sgml">
+<!entity include-reference.sgml SYSTEM "reference.sgml">
 
 <!-- The following entities are used in the automatically generated
      `reference.sgml' to include custom descriptions of the features.
diff --git a/doc/libgtopConf.sh b/doc/libgtopConf.sh
deleted file mode 100644
index 0fc78273..00000000
--- a/doc/libgtopConf.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Configuration of the libgtop package
-#
-
-LIBGTOP_LIBDIR="/home/baulig/TEST/lib"
-LIBGTOP_INCLUDEDIR="/home/baulig/TEST/include"
-
-LIBGTOP_LIBS="-L/home/baulig/TEST/lib -lgtop -lgtop_common -lgtop_sysdeps -L/usr/X11R6/lib -lXau"
-LIBGTOP_INCS="-I/home/baulig/TEST/include"
-
-LIBGTOP_NAMES_LIBS="-L/home/baulig/TEST/lib -lgtop -lgtop_common -lgtop_sysdeps -lgtop_names -L/usr/X11R6/lib -lXau"
-LIBGTOP_NAMES_INCS="-I/home/baulig/TEST/include -DGLIBTOP_NAMES"
-
-LIBGTOP_GUILE_LIBS="-L/home/baulig/TEST/lib -lgtop -lgtop_guile -lgtop_common -lgtop_sysdeps -L/usr/X11R6/lib -lXau -L/home/baulig/INSTALL/lib -lguile -ldl -lreadline -ltermcap -lm"
-LIBGTOP_GUILE_INCS="-I/home/baulig/TEST/include -I/home/baulig/INSTALL/include -DGLIBTOP_GUILE"
-
-LIBGTOP_GUILE_NAMES_LIBS="-L/home/baulig/TEST/lib -lgtop -lgtop_guile -lgtop_common -lgtop_sysdeps -lgtop_names -L/usr/X11R6/lib -lXau"
-LIBGTOP_GUILE_NAMES_INCS="-I/home/baulig/TEST/include -I/home/baulig/INSTALL/include -DGLIBTOP_GUILE -DGLIBTOP_NAMES"
-
-LIBGTOP_BINDIR="/home/baulig/TEST/bin"
-LIBGTOP_SERVER="/home/baulig/TEST/bin/libgtop_server"
-
-LIBGTOP_MAJOR_VERSION="0"
-LIBGTOP_MINOR_VERSION="2a"
-LIBGTOP_VERSION="0.2a"
-
-LIBGTOP_SERVER_VERSION="1"
-
-libgtop_sysdeps_dir="linux"
-libgtop_need_server="no"
-libgtop_use_machine_h="no"
-
-libgtop_guile_found="yes"
-
-libgtop_want_examples=""