diff --git a/doc/.cvsignore b/doc/.cvsignore
index 535633bde..4a29810e7 100644
--- a/doc/.cvsignore
+++ b/doc/.cvsignore
@@ -1,3 +1,21 @@
 Makefile
 Makefile.in
-data-rep.info
+stamp-vti
+*.log
+*.dvi
+*.aux
+*.toc
+*.cp
+*.fn
+*.vr
+*.tp
+*.ky
+*.pg
+*.cps
+*.fns
+*.tps
+*.vrs
+*.ps
+*.info*
+*.html
+version.texi
diff --git a/doc/ChangeLog b/doc/ChangeLog
index aa49e690b..23155dbea 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,6 +1,7 @@
 2001-03-09  Neil Jerram  <neil@ossau.uklinux.net>
 
-	Moving texinfo files from guile-doc/ref into guile-core/doc:
+	Moving texinfo files from guile-doc/ref and guile-doc/tutorial
+	into guile-core/doc:
 
 	* env.texi, indices.texi, mbapi.texi, mltext.texi, scripts.texi,
 	scsh.texi, tcltk.texi, hierarchy.txt, scheme-indices.texi,
@@ -13,7 +14,11 @@
 	scheme-io.texi, scheme-memory.texi, scheme-modules.texi,
 	scheme-options.texi, scheme-procedures.texi,
 	scheme-scheduling.texi, scheme-translation.texi, guile.texi,
-	scheme-data.texi, scheme-ideas.texi, expect.texi: New files.
+	scheme-data.texi, scheme-ideas.texi, expect.texi,
+	ChangeLog-guile-doc-ref, guile-tut.texi,
+	ChangeLog-guile-doc-tutorial: New files.
+
+	* .cvsignore, Makefile.am: Merged.
 
 	Both the following files are about to be replaced by files from
 	guile-doc/ref.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index aecb266f2..8641100cc 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -19,11 +19,37 @@
 ##   to the Free Software Foundation, Inc., 59 Temple Place, Suite
 ##   330, Boston, MA 02111-1307 USA
 
-# This rule overrides automake's rule for version.texi.  It causes
-# version.texi to be created even in non-maintainer-mode.
-#
-$(srcdir)/version.texi: stamp-vti
-	@:
+AUTOMAKE_OPTIONS = foreign
+
+info_TEXINFOS = guile.texi r4rs.texi r5rs.texi goops.texi guile-tut.texi
+
+guile_TEXINFOS = preface.texi intro.texi scheme-intro.texi \
+	scheme-ideas.texi scheme-data.texi scheme-procedures.texi \
+	scheme-utility.texi scheme-binding.texi scheme-control.texi \
+	scheme-io.texi scheme-evaluation.texi scheme-memory.texi \
+	scheme-modules.texi scheme-scheduling.texi scheme-options.texi \
+	scheme-translation.texi scheme-debug.texi deprecated.texi \
+	scheme-reading.texi scheme-indices.texi slib.texi posix.texi \
+	expect.texi scsh.texi tcltk.texi scripts.texi gh.texi scm.texi \
+	appendices.texi indices.texi
+
+goops_TEXINFOS = goops-tutorial.texi hierarchy.eps hierarchy.txt
+
+# Optionally support building an HTML version of the reference manual.
+
+if HTML
+
+htmldir = $(prefix)/html/guile-$(VERSION)
+
+html_DATA = guile_toc.html $(shell ls guile_*.html 2>/dev/null) guile-tut_toc.html $(shell ls guile-tut_*.html 2>/dev/null)
+
+guile_toc.html: guile.texi $(guile_TEXINFOS)
+	$(TEXI2HTML) -split_chapter guile.texi
+
+guile-tut_toc.html: guile-tut.texi
+	$(TEXI2HTML) -split_chapter guile-tut.texi
+
+endif
 
 EXAMPLE_SMOB_FILES = \
     ChangeLog Makefile README COPYING image-type.c image-type.h myguile.c
@@ -37,3 +63,9 @@ dist-hook:
 	 dest="`cd $(distdir)/example-smob; pwd`"; \
          cd example-smob; \
 	 cp $(EXAMPLE_SMOB_FILES) $$dest)
+
+# This rule overrides automake's rule for version.texi.  It causes
+# version.texi to be created even in non-maintainer-mode.
+#
+$(srcdir)/version.texi: stamp-vti
+	@: