diff --git a/mk/config.mk.in b/mk/config.mk.in
index bed43c98a185a878f4ab7818a6339d3352e652e8..85fc4e22c41310db282ea45abe67b41209f6fade 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -632,10 +632,10 @@ YACC			= @YaccCmd@
 #-----------------------------------------------------------------------------
 # SGML stuff (currently not configured - we assume you have it)
 
-SGML2LATEX		= sgml2latex
-SGML2HTML		= sgml2html
-SGML2INFO		= sgml2info
-SGML2TXT		= sgml2txt
+SGML2DVI		= db2dvi
+SGML2HTML		= db2html
+SGML2INFO		= db2info
+SGML2RTF		= db2rtf
 
 #-----------------------------------------------------------------------------
 # 		FPtools support software
@@ -649,7 +649,6 @@ MSUB			= $(MSUB_PREFIX)msub
 ETAGS			= $(ETAGS_PREFIX)etags
 VERBATIM		= $(VERBATIM_PREFIX)verbatim
 SGMLVERB		= $(SGMLVERB_PREFIX)sgmlverb
-SGML2LATEX		= sgml2latex
 RUNTEST			= $(RUNTEST_PREFIX)runstdtest
 HAPPY			= @HappyCmd@
 HAPPY_VERSION		= @HappyVersion@		
diff --git a/mk/opts.mk b/mk/opts.mk
index e7e1478208546c97f3f006df926bb0b9de787e51..3980c9592b6a18e3643948aa27c3a2c021b6bb90 100644
--- a/mk/opts.mk
+++ b/mk/opts.mk
@@ -5,7 +5,7 @@
 #	This file defines Make variables for the
 #	option flags for each utility program
 #
-# 	$Id: opts.mk,v 1.11 1999/06/03 07:12:10 sof Exp $
+# 	$Id: opts.mk,v 1.12 2000/01/05 11:55:29 rrt Exp $
 #
 #################################################################################
 
@@ -113,9 +113,9 @@ MKDEPENDHS_OPTS    = $(SRC_MKDEPENDHS_OPTS) $(WAY$(_way)_MKDEPENDHS_OPTS) \
                      $(EXTRA_MKDEPENDHS_OPTS)
 MKDEPENDLIT_OPTS   = $(SRC_MKDEPENDLIT_OPTS) $(WAY$(_way)_MKDEPENDLIT_OPTS) \
                      $(EXTRA_MKDEPENDLIT_OPTS)
-SGML2LATEX_OPTS    = $(SRC_SGML2LATEX_OPTS) $(WAY$(_way)_SGML2LATEX_OPTS) $(EXTRA_SGML2LATEX_OPTS)
+SGML2DVI_OPTS      = $(SRC_SGML2DVI_OPTS) $(WAY$(_way)_SGML2DVI_OPTS) $(EXTRA_SGML2DVI_OPTS)
 SGML2INFO_OPTS     = $(SRC_SGML2INFO_OPTS) $(WAY$(_way)_SGML2INFO_OPTS) $(EXTRA_INFO_OPTS)
-SGML2TXT_OPTS      = $(SRC_SGML2TXT_OPTS) $(WAY$(_way)_SGML2TXT_OPTS) $(EXTRA_SGML2TXT_OPTS)
+SGML2RTF_OPTS      = $(SRC_SGML2RTF_OPTS) $(WAY$(_way)_SGML2RTF_OPTS) $(EXTRA_SGML2RTF_OPTS)
 SGML2HTML_OPTS     = $(SRC_SGML2HTML_OPTS) $(WAY$(_way)_SGML2HTML_OPTS) $(EXTRA_SGML2HTML_OPTS)
 UGEN_OPTS          = $(SRC_UGEN_OPTS) $(WAY$(_way)_UGEN_OPTS) $(EXTRA_UGEN_OPTS)
 UNLIT_OPTS         = $(SRC_UNLIT_OPTS) $(WAY$(_way)_UNLIT_OPTS) $(EXTRA_UNLIT_OPTS)
diff --git a/mk/suffix.mk b/mk/suffix.mk
index dd17b4dc03390b02930dda61e7b871bdf7f74305..c919c7afc9bd37918363d1507b29726edbfa598d 100644
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -209,17 +209,13 @@ SRC_HC_PRE_OPTS  += $(HC_PRE__)
 	@$(RM) $@
 	expand $< | $(SGMLVERB) > $@
 
-%.tex : %.sgml
-	@$(RM) $@
-	$(SGML2LATEX) $(SGML2LATEX_OPTS) -m --output=tex $<
-
 %.dvi : %.sgml
 	@$(RM) $@
-	$(SGML2LATEX) $(SGML2LATEX_OPTS) -m --output=dvi $<
+	$(SGML2DVI) $(SGML2DVI_OPTS) $<
 
 %.ps : %.sgml
 	@$(RM) $@
-	$(SGML2LATEX) $(SGML2LATEX_OPTS) -m --output=ps $<
+	$(SGML2PS) $(SGML2PS_OPTS) $<
 
 %.html : %.sgml
 	@$(RM) $@
@@ -229,9 +225,9 @@ SRC_HC_PRE_OPTS  += $(HC_PRE__)
 	@$(RM) $@
 	$(SGML2INFO) $(SGML2INFO_OPTS) $<
 
-%.txt : %.sgml
+%.rtf : %.sgml
 	@$(RM) $@
-	$(SGML2TXT) $(SGML2TXT_OPTS) $<
+	$(SGML2RTF) $(SGML2RTF_OPTS) $<
 
 #-----------------------------------------------------------------------------
 # Literate suffix rules