diff --git a/doc/Makefile.am b/doc/Makefile.am
index aa7f8130f..60c6a8c58 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -6,12 +6,14 @@ AUTOMAKE_OPTIONS = no-texinfo.tex
 
 MAKEINFOFLAGS = --css-include=$(srcdir)/heimdal.css
 
-TEXI2DVI = true # ARGH, make distcheck can't be disabled to not build dvifiles
+#TEXI2DVI = true # ARGH, make distcheck can't be disabled to not build dvifiles
 
 info_TEXINFOS = heimdal.texi hx509.texi
 
 BUILT_SOURCES = vars.texi
 
+#all: html pdf dvi ps info
+
 dxy_subst = sed -e 's,[@]srcdir[@],$(srcdir),g' \
 	-e 's,[@]objdir[@],.,g' \
 	-e 's,[@]PACKAGE_VERSION[@],$(PACKAGE_VERSION),g'
diff --git a/doc/whatis.texi b/doc/whatis.texi
index 2b0e98de5..8c7770b81 100644
--- a/doc/whatis.texi
+++ b/doc/whatis.texi
@@ -35,12 +35,6 @@ services can authenticate each other.
 @end macro
 @end ifinfo
 
-@iftex
-@macro sub{arg}
-@textsubscript{\arg\}
-@end macro
-@end iftex
-
 @ifhtml
 @macro sub{arg}
 
@@ -51,13 +45,19 @@ services can authenticate each other.
 @end macro
 @end ifhtml
 
-@c ifdocbook
-@c macro sub{arg}
-@c docbook
-@c <subscript>\arg\</subscript>
-@c end docbook
-@c end macro
-@c end ifdocbook
+@ifdocbook
+@macro sub{arg}
+@docbook
+@<subscript>\arg\</subscript>
+@end docbook
+@end macro
+@end ifdocbook
+
+@c @iftex
+@c @macro sub{arg}
+@c @textsubscript{\arg\}
+@c @end macro
+@c @end iftex
 
 @quotation
 @strong{Note} This discussion is about Kerberos version 4, but version