diff --git a/Doc/tools/sgmlconv/Makefile b/Doc/tools/sgmlconv/Makefile
index d48e098..30a846e 100644
--- a/Doc/tools/sgmlconv/Makefile
+++ b/Doc/tools/sgmlconv/Makefile
@@ -1,4 +1,4 @@
-# Simple makefile to control SGML generation for the entire document tree.
+# Simple makefile to control XML generation for the entire document tree.
 # This should be used from the top-level directory (Doc/), not the directory
 # that actually contains this file:
 #
@@ -10,18 +10,15 @@
 TOOLSDIR=tools
 
 SGMLRULES=../$(TOOLSDIR)/sgmlconv/make.rules
-SUBDIRS=api ext lib mac ref tut
+# The 'inst' directory breaks the conversion, so skip it for now.
+SUBDIRS=api dist ext lib mac ref tut
 SUBMAKE=$(MAKE) -f $(SGMLRULES) TOOLSDIR=../$(TOOLSDIR)
 
 all:	xml
 
-.PHONY: sgml xml
+.PHONY: esis xml
 .PHONY: $(SUBDIRS)
 
-sgml:
-	for DIR in $(SUBDIRS) ; do \
-	    (cd $$DIR; $(SUBMAKE) sgml) || exit $$? ; done
-
 xml:
 	for DIR in $(SUBDIRS) ; do \
 	    (cd $$DIR; $(SUBMAKE) xml) || exit $$? ; done
@@ -30,15 +27,25 @@
 	for DIR in $(SUBDIRS) ; do \
 	    (cd $$DIR; $(SUBMAKE) esis) || exit $$? ; done
 
-tarball:  sgml
-	tar cf - sgml tools/sgmlconv */*.sgml | gzip -9 >sgml-1.5.2b2.tgz
+esis1:
+	for DIR in $(SUBDIRS) ; do \
+	    (cd $$DIR; $(SUBMAKE) esis1) || exit $$? ; done
+
+tarball:  xml
+	tar cf - tools/sgmlconv */*.xml | gzip -9 >xml-1.5.2b2.tgz
 
 api:
 	cd api; $(SUBMAKE)
 
+dist:
+	cd dist; $(SUBMAKE)
+
 ext:
 	cd ext; $(SUBMAKE)
 
+inst:
+	cd inst; $(SUBMAKE)
+
 lib:
 	cd lib; $(SUBMAKE)
 
diff --git a/Doc/tools/sgmlconv/make.rules b/Doc/tools/sgmlconv/make.rules
index 84c8f31..93579c5 100644
--- a/Doc/tools/sgmlconv/make.rules
+++ b/Doc/tools/sgmlconv/make.rules
@@ -1,6 +1,6 @@
 # -*- makefile -*-
 #
-# Extra magic needed by the LaTeX->SGML conversion process.  This requires
+# Extra magic needed by the LaTeX->XML conversion process.  This requires
 # $(TOOLSDIR) to be properly defined.
 
 DOCFIXER=	$(TOOLSDIR)/sgmlconv/docfixer.py
@@ -9,7 +9,7 @@
 CONVERSION=	$(TOOLSDIR)/sgmlconv/conversion.xml
 
 ESISTARGETS=	$(patsubst %.tex,%.esis,$(wildcard *.tex))
-SGMLTARGETS=	$(patsubst %.tex,%.sgml,$(wildcard *.tex))
+ESIS1TARGETS=	$(patsubst %.tex,%.esis1,$(wildcard *.tex))
 XMLTARGETS=	$(patsubst %.tex,%.xml,$(wildcard *.tex))
 
 L2EFLAGS=
@@ -17,34 +17,32 @@
 all:	xml
 
 esis:	$(ESISTARGETS)
-sgml:	$(SGMLTARGETS)
+esis1:	$(ESIS1TARGETS)
 xml:	$(XMLTARGETS)
 
 ESISTOOLS=	$(TOOLSDIR)/sgmlconv/esistools.py
 
 $(ESISTARGETS): $(LATEX2ESIS) $(DOCFIXER) $(ESISTOOLS) $(CONVERSION)
+$(ESIS1TARGETS): $(LATEX2ESIS) $(CONVERSION)
 # This variant is easier to work with while debugging the conversion spec:
 #$(ESISTARGETS): $(LATEX2ESIS) $(DOCFIXER) $(ESISTOOLS)
-$(SGMLTARGETS): $(ESIS2ML)
 $(XMLTARGETS): $(ESIS2ML)
 
 
-.SUFFIXES: .esis .sgml .tex .xml
+.SUFFIXES: .esis .esis1 .tex .xml
 
-.tex.esis:
-	$(LATEX2ESIS) $(L2EFLAGS) $< temp.esis
-	$(DOCFIXER) temp.esis $@
-	rm temp.esis
+.tex.esis1:
+	$(LATEX2ESIS) $(L2EFLAGS) $< $@
 
-.esis.sgml:
-	$(ESIS2ML) --sgml --autoclose para $< $@
+.esis1.esis:
+	$(DOCFIXER) $< $@
 
 .esis.xml:
 	$(ESIS2ML) --xml $< $@
 
 
 clean:
-	rm -f *.esis
+	rm -f *.esis *.esis1
 
 clobber: clean
-	rm -f *.sgml *.xml
+	rm -f *.xml