diff -urN heimdal-1.6~git20120403+dfsg1.old/doc/hx509.texi heimdal-1.6~git20120403+dfsg1/doc/hx509.texi
--- heimdal-1.6~git20120403+dfsg1.old/doc/hx509.texi	2012-05-03 15:39:09.000000000 +0000
+++ heimdal-1.6~git20120403+dfsg1/doc/hx509.texi	2013-06-12 19:23:31.342744883 +0000
@@ -34,9 +34,20 @@
 @subtitle 2008
 @author Love Hörnquist Åstrand
 
+@iftex
 @def@copynext{@vskip 20pt plus 1fil}
 @def@copyrightstart{}
 @def@copyrightend{}
+@end iftex
+@ifinfo
+@macro copynext
+@end macro
+@macro copyrightstart
+@end macro
+@macro copyrightend
+@end macro
+@end ifinfo
+
 @page
 @copyrightstart
 Copyright (c) 1994-2008 Kungliga Tekniska Högskolan
@@ -183,6 +194,13 @@
 * CMS signing and encryption::
 * Certificate matching::
 * Software PKCS 11 module::
+* Creating a CA certificate::
+* Issuing certificates::
+* Issuing CRLs::
+* Application requirements::
+* CMS background::
+* Matching syntax::
+* How to use the PKCS11 module::
 
 @detailmenu
  --- The Detailed Node Listing ---
diff -urN heimdal-1.6~git20120403+dfsg1.old/doc/whatis.texi heimdal-1.6~git20120403+dfsg1/doc/whatis.texi
--- heimdal-1.6~git20120403+dfsg1.old/doc/whatis.texi	2012-05-03 15:39:10.000000000 +0000
+++ heimdal-1.6~git20120403+dfsg1/doc/whatis.texi	2013-06-12 19:12:32.130262662 +0000
@@ -35,10 +35,10 @@
 @end macro
 @end ifinfo
 
-@tex
+@iftex
 @def@xsub#1{$_{#1}$}
 @global@let@sub=@xsub
-@end tex
+@end iftex
 
 @ifhtml
 @macro sub{arg}