diff --git a/guile/ChangeLog b/guile/ChangeLog
index dbb90e0c..c9c4ebde 100644
--- a/guile/ChangeLog
+++ b/guile/ChangeLog
@@ -1,3 +1,14 @@
+1998-10-11  Martin Baulig  <martin@home-of-linux.org>
+
+	This directory has been moved from the `libgtop' module to the
+	`libgtop-docu' module in the GNOME CVS.
+
+	* make-docbook.scm: Make it work with the new Guile interface
+	of LibGTop from the libgtop-bindings module.
+
+	* Makefile.am: Use the installed `features.def' file of LibGTop
+	to create the `features.scm'.
+
 1998-10-11  Martin Baulig  <martin@home-of-linux.org>
 
 	* dynamic.c, dynamic_names.c: Removed.
diff --git a/guile/Makefile.am b/guile/Makefile.am
index 9e33e223..b6367495 100644
--- a/guile/Makefile.am
+++ b/guile/Makefile.am
@@ -2,11 +2,13 @@ LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
 CFLAGS				= -Wall -W @CFLAGS@
 
+noinst_DATA			= features.scm
+
 EXTRA_DIST			= features.awk
 
 CLEANFILES			= features.scm
 
-features.scm: features.awk $(top_builddir)/config.h $(top_srcdir)/features.def
-	$(AWK) -f $(srcdir)/features.awk < $(top_srcdir)/features.def > tmp-t
+features.scm: features.awk $(top_builddir)/config.h @LIBGTOP_FEATURES_DEF@
+	$(AWK) -f $(srcdir)/features.awk < @LIBGTOP_FEATURES_DEF@ > tmp-t
 	mv tmp-t features.scm
 
diff --git a/guile/make-docbook.scm b/guile/make-docbook.scm
index 1ac5a871..1731903c 100644
--- a/guile/make-docbook.scm
+++ b/guile/make-docbook.scm
@@ -1,5 +1,7 @@
 ;; $Id$
 
+(use-modules (libgtop names))
+
 (load "features.scm")
 
 (define sysdeps-list '())
@@ -10,9 +12,9 @@
 
 (define make-sysdeps-list
   (lambda ()
-    (letrec ((names (cdr (glibtop-names-sysdeps)))
-	     (labels (cdr (glibtop-labels-sysdeps)))
-	     (descriptions (cdr (glibtop-descriptions-sysdeps)))
+    (letrec ((names (cdr glibtop-names-sysdeps))
+	     (labels (cdr glibtop-labels-sysdeps))
+	     (descriptions (cdr glibtop-descriptions-sysdeps))
 	     )
       (for-each (lambda (feature)
 		  (let* ((label (car labels))
@@ -34,15 +36,16 @@
 
 (define make-function-reference
   (lambda (feature)
-    (let* ((names (eval-string (string "(glibtop-names-" feature ")")))
-	   (types (eval-string (string "(glibtop-types-" feature ")")))
-	   (labels (eval-string (string "(glibtop-labels-" feature ")")))
+    (let* ((feature-name (car (assoc-ref libgtop-feature-names feature)))
+	   (names (eval-string (string "glibtop-names-" feature-name)))
+	   (types (eval-string (string "glibtop-types-" feature-name)))
+	   (labels (eval-string (string "glibtop-labels-" feature-name)))
 	   (sysdeps (assoc-ref sysdeps-list feature))
 	   (retval (car (car (assoc-ref libgtop-features feature))))
 	   (name (assoc-ref sysdeps 'name))
 	   (label (assoc-ref sysdeps 'label))
 	   (description (assoc-ref sysdeps 'description))
-	   (descriptions (eval-string (string "(glibtop-descriptions-" feature ")")))
+	   (descriptions (eval-string (string "glibtop-descriptions-" feature-name)))
 	   (feature_nounder (car (assoc-ref libgtop-feature-names feature)))
 	   (decl-list '()) (field-list '())
 
@@ -334,13 +337,11 @@
 ;; <paramdef>glibtop *<parameter>server</parameter>, glibtop_cpu *<parameter>cpu_usage</parameter>
 ;; </paramdef></funcsynopsis>
 
-
-
 (begin
   (make-sysdeps-list)
   
   (for-each (lambda (x)
 	      (display (make-function-reference x))
 	      )
-	    (cdr (glibtop-names-sysdeps)))
+	    (cdr glibtop-names-sysdeps))
   )