diff --git a/doc/hx509.texi b/doc/hx509.texi
index c927357f7..d050c2118 100644
--- a/doc/hx509.texi
+++ b/doc/hx509.texi
@@ -34,9 +34,18 @@
 @subtitle 2008
 @author Love Hörnquist Åstrand
 
+@iftex
 @def@copynext{@vskip 20pt plus 1fil}
 @def@copyrightstart{}
 @def@copyrightend{}
+@end iftex
+@macro copynext
+@end macro
+@macro copyrightstart
+@end macro
+@macro copyrightend
+@end macro
+
 @page
 @copyrightstart
 Copyright (c) 1994-2008 Kungliga Tekniska Högskolan
@@ -183,6 +192,13 @@ This manual is for version @value{VERSION} of hx509.
 * 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 --git a/doc/whatis.texi b/doc/whatis.texi
index 891e27552..7d83725d9 100644
--- a/doc/whatis.texi
+++ b/doc/whatis.texi
@@ -43,9 +43,11 @@ services can authenticate each other.
 
 @ifhtml
 @macro sub{arg}
+
 @html
 <sub>\arg\</sub>
 @end html
+
 @end macro
 @end ifhtml