diff --git a/ChangeLog b/ChangeLog
index 881743265..a490fe3a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2000-06-12  Mikael Djurfeldt  <mdj@thalamus.nada.kth.se>
 
+	* Makefile.am (ACLOCAL): Define as ./guile-aclocal.sh.
+	(The rule will cd to $(top_srcdir).)
+
+	* configure.in (EXTRA_DOT_DOC_FILES): Create from LIBOBJS and
+	substitute it into libguile/Makefile.
+
 	* HACKING: Updated recommended libtool version to be 1.3.5.
 
 	* RELEASE: Say that we should update HACKING to reflect the
diff --git a/RELEASE b/RELEASE
index a5431cf1c..89d2aa554 100644
--- a/RELEASE
+++ b/RELEASE
@@ -107,7 +107,8 @@ Spiffing checklist:
 * Commit all changes to the CVS repository.
 * Build a test distribution.
   + BEFORE doing 'make dist', configure the source tree for build
-    in the same tree with configuration option --with-threads.
+    in the same tree with configuration options
+    --enable-maintainer-mode --enable-debug-malloc --with-threads.
   + Make sure that readline was enabled correctly.
   + Build the tree.
     (If the above steps are not done, the dependencies won't be properly
diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index d952886f7..2cd4c7348 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,5 +1,9 @@
 2000-06-12  Mikael Djurfeldt  <mdj@thalamus.nada.kth.se>
 
+	* Makefile.am (EXTRA_DOT_X_FILES, EXTRA_DOT_DOC_FILES): New
+	variables.
+	(guile-procedures.txt): Depend on EXTRA_DOT_DOC_FILES.
+
 	* snarf.h (SCM_SNARF_HERE, SCM_SNARF_INIT, SCM_SNARF_DOCS):
 	Renamed from SCM_HERE, SCM_INIT, SCM_DOCS.
 
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 0d85a8425..e3d7a9c98 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -59,14 +59,14 @@ DOT_X_FILES =								\
     hooks.x init.x ioext.x iselect.x keywords.x lang.x list.x load.x	\
     macros.x mallocs.x modules.x net_db.x numbers.x objects.x		\
     objprop.x options.x pairs.x ports.x posix.x print.x procprop.x	\
-    procs.x random.x read.x regex-posix.x root.x scmsigs.x		\
+    procs.x random.x read.x root.x scmsigs.x				\
     script.x simpos.x smob.x socket.x sort.x srcprop.x stackchk.x	\
     stacks.x stime.x strings.x strop.x strorder.x strports.x struct.x	\
     symbols.x tag.x throw.x variable.x vectors.x			\
     version.x vports.x weaks.x
 
 EXTRA_DOT_X_FILES = debug-malloc.x filesys.x net_db.x posix.x ramap.x	\
-                    socket.x threads.x unif.x
+                    regex-posix.x socket.x threads.x unif.x
 
 EXTRA_DOT_DOC_FILES = @EXTRA_DOT_DOC_FILES@