diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index 847f8e387..2dbf12128 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,7 @@
+Tue May 29 16:24:46 2001  Christopher Faylor <cgf@cygnus.com>
+
+	* Makefile.in: Accomodate newer versions of docbook and openjade.
+
 Thu Apr 12 23:52:00 2001  Corinna Vinschen <corinna@vinschen.de>
 
 	* cygwinenv.sgml: Add text for `check_case' option.
diff --git a/winsup/doc/Makefile.in b/winsup/doc/Makefile.in
index 2abc34f16..740f12a8c 100644
--- a/winsup/doc/Makefile.in
+++ b/winsup/doc/Makefile.in
@@ -29,7 +29,7 @@ TEXI2HTML:=texi2html
 
 include $(srcdir)/../Makefile.common
 
-TOCLEAN:=faq.txt *.html readme.txt doctool.o doctool \
+TOCLEAN:=faq.txt ./*.html readme.txt doctool.o doctool \
 	 cygwin-ug.sgml cygwin-ug-net.sgml
 
 .SUFFIXES:
@@ -87,25 +87,26 @@ cygwin-api-int.sgml : cygwin-api.in.sgml ./doctool Makefile
 	-ps2pdf $< $@
 
 %.info: %.texinfo
-	-$(MAKEINFO) -I$(srcdir) $<
+	-$(MAKEINFO) -I $(srcdir) $<
 
 %.txt: %.texinfo
-	-$(MAKEINFO) -I$(srcdir) $<
+	-$(MAKEINFO) -I $(srcdir) $<
 
 %.html: %.texinfo
-	-$(TEXI2HTML) -I$(srcdir) $<
+	-$(TEXI2HTML) -I $(srcdir) $<
 
 readme.txt: $(srcdir)/readme.texinfo $(srcdir)/*.texinfo
 	-$(MAKEINFO) -I$(srcdir) --no-split --no-headers $< -o - |\
 	sed '/^Concept Index/,$$d' > $@
 
 faq.html: $(srcdir)/faq.texinfo $(srcdir)/*.texinfo
-	-for i in $(srcdir)/*.texinfo ; do \
+	-rm -f faq_toc.html; \
+	for i in $(srcdir)/*.texinfo ; do \
 		sed < $$i -e 's?@file{\([fth]*p://[^}]*\)}?@strong{<A HREF="\1">\1</A>}?' \
 	    -e 's?\([.+a-zA-Z0-9-]*@@[.a-zA-Z0-9-]*[a-zA-Z0-9]\)?<A HREF="mailto:\1">\1</A>?' >./`basename $$i` ; done; \
-	$(TEXI2HTML) -split_chapter  -v ./faq.texinfo; \
+	$(TEXI2HTML) --split -v ./faq.texinfo; \
 	rm -f *.texinfo; \
-	cp faq_toc.html faq.html
+	[ -r faq_toc.html ] && mv faq_toc.html faq.html; exit 0
 
 TBFILES = cygwin-ug-net.dvi cygwin-ug-net.rtf cygwin-ug-net.ps \
 	  cygwin-ug-net.pdf cygwin-ug-net.sgml \
diff --git a/winsup/doc/readme.texinfo b/winsup/doc/readme.texinfo
index 42e81d67d..bcd32a633 100644
--- a/winsup/doc/readme.texinfo
+++ b/winsup/doc/readme.texinfo
@@ -5,7 +5,6 @@
 
 @setfilename readme.txt
 
-@include sites.texinfo
 @include install.texinfo
 
 @chapter Release Information