diff --git a/bochs/Makefile.in b/bochs/Makefile.in
index b1489873f..948101886 100644
--- a/bochs/Makefile.in
+++ b/bochs/Makefile.in
@@ -238,7 +238,7 @@ $(BX_OBJS): $(BX_INCLUDES)
 bxversion.h:
 	$(RM) -f bxversion.h
 	echo '/////////////////////////////////////////////////////////////////////////' > bxversion.h
-	echo '// $$Id: Makefile.in,v 1.126 2002-12-11 19:21:53 bdenney Exp $$' >> bxversion.h
+	echo '// $$Id: Makefile.in,v 1.127 2002-12-13 16:20:52 bdenney Exp $$' >> bxversion.h
 	echo '/////////////////////////////////////////////////////////////////////////' >> bxversion.h
 	echo '// This file is generated by "make bxversion.h"' >> bxversion.h
 	echo "#define VER_STRING \"$(VER_STRING)\"" >> bxversion.h
@@ -364,11 +364,13 @@ install_share::
 install_doc::
 	for i in $(DESTDIR)$(docdir); do mkdir -p $$i && test -d $$i && test -w $$i; done
 	for i in $(INSTALL_LIST_DOC); do if test -f $$i; then cp $$i $(DESTDIR)$(docdir); else cp $(srcdir)/$$i $(DESTDIR)$(docdir); fi; done
-	$(CP) -r $(srcdir)/docs-html $(DESTDIR)$(docdir)
 	$(RM) -f $(DESTDIR)$(docdir)/README
 	$(CAT) $(srcdir)/build/linux/README.linux-binary $(srcdir)/README > $(DESTDIR)$(docdir)/README
 	$(CP) $(srcdir)/.bochsrc $(DESTDIR)$(docdir)/bochsrc-sample.txt
 
+install_docbook:
+	cd doc/docbook; make install
+
 install_man::
 	-mkdir -p $(DESTDIR)$(man1dir)
 	-mkdir -p $(DESTDIR)$(man5dir)
diff --git a/bochs/configure b/bochs/configure
index 99f2a34ce..47e299405 100755
--- a/bochs/configure
+++ b/bochs/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in,v 1.184 2002/12/12 13:27:46 cbothamy Exp .
+# From configure.in Id: configure.in,v 1.185 2002/12/12 19:43:40 vruppert Exp .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.53.
 #
@@ -22588,7 +22588,7 @@ echo "${ECHO_T}no" >&6
 fi
 
 
-ac_config_files="$ac_config_files Makefile iodev/Makefile debug/Makefile bios/Makefile cpu/Makefile memory/Makefile gui/Makefile disasm/Makefile ${INSTRUMENT_DIR}/Makefile misc/Makefile fpu/Makefile install-x11-fonts build/linux/bochs-dlx bxversion.h build/macosx/Info.plist build/win32/nsis/Makefile build/win32/nsis/bochs.nsi"
+ac_config_files="$ac_config_files Makefile iodev/Makefile debug/Makefile bios/Makefile cpu/Makefile memory/Makefile gui/Makefile disasm/Makefile ${INSTRUMENT_DIR}/Makefile misc/Makefile fpu/Makefile doc/docbook/Makefile install-x11-fonts build/linux/bochs-dlx bxversion.h build/macosx/Info.plist build/win32/nsis/Makefile build/win32/nsis/bochs.nsi"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -23070,6 +23070,7 @@ do
   "${INSTRUMENT_DIR}/Makefile" ) CONFIG_FILES="$CONFIG_FILES ${INSTRUMENT_DIR}/Makefile" ;;
   "misc/Makefile" ) CONFIG_FILES="$CONFIG_FILES misc/Makefile" ;;
   "fpu/Makefile" ) CONFIG_FILES="$CONFIG_FILES fpu/Makefile" ;;
+  "doc/docbook/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/docbook/Makefile" ;;
   "install-x11-fonts" ) CONFIG_FILES="$CONFIG_FILES install-x11-fonts" ;;
   "build/linux/bochs-dlx" ) CONFIG_FILES="$CONFIG_FILES build/linux/bochs-dlx" ;;
   "bxversion.h" ) CONFIG_FILES="$CONFIG_FILES bxversion.h" ;;
diff --git a/bochs/configure.in b/bochs/configure.in
index d1abe0ea1..8699166b8 100644
--- a/bochs/configure.in
+++ b/bochs/configure.in
@@ -2,7 +2,7 @@ dnl // Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.50)
 AC_INIT(bochs.h)
-AC_REVISION([[$Id: configure.in,v 1.185 2002-12-12 19:43:40 vruppert Exp $]])
+AC_REVISION([[$Id: configure.in,v 1.186 2002-12-13 16:20:34 bdenney Exp $]])
 AC_CONFIG_HEADER(config.h)
 AC_CONFIG_HEADER(ltdlconf.h)
 
@@ -2233,6 +2233,7 @@ AC_PATH_PROG(TAR, tar)
 AC_OUTPUT(Makefile iodev/Makefile debug/Makefile bios/Makefile \
 	 cpu/Makefile memory/Makefile gui/Makefile \
 	 disasm/Makefile ${INSTRUMENT_DIR}/Makefile misc/Makefile \
-	 fpu/Makefile install-x11-fonts build/linux/bochs-dlx \
+	 fpu/Makefile doc/docbook/Makefile \
+	 install-x11-fonts build/linux/bochs-dlx \
 	 bxversion.h build/macosx/Info.plist \
 	 build/win32/nsis/Makefile build/win32/nsis/bochs.nsi)