diff --git a/doc/Makefile.am b/doc/Makefile.am
index bb7e87a..11eca73 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -44,7 +44,7 @@
 # because it cant just work from the png's directly it seems - contrary
 # to the documentation...
 quagga.pdf: $(info_TEXINFOS) $(figures_pdf) $(quagga_TEXINFOS)
-	$(TEXI2PDF) -o "$@" $<
+	$(TEXI2PDF) -o "$@" $< || true
 
 quagga_TEXINFOS = appendix.texi babeld.texi basic.texi bgpd.texi filter.texi \
 	install.texi ipv6.texi kernel.texi main.texi ospf6d.texi ospfd.texi \
diff --git a/doc/basic.texi b/doc/basic.texi
index b3b23ca..0f7bec9 100644
--- a/doc/basic.texi
+++ b/doc/basic.texi
@@ -15,8 +15,8 @@
 daemons.
 
 @menu
-* Terminal Mode Commands::      Common commands used in a VTY
 * Config Commands::             Commands used in config files
+* Terminal Mode Commands::      Common commands used in a VTY
 * Common Invocation Options::   Starting the daemons
 * Virtual Terminal Interfaces:: Interacting with the daemons
 @end menu
@@ -580,8 +580,8 @@
 @kindex @key{TAB}
 Use command line completion by typing @key{TAB}.
 
-@item
-@kindex ?
+@item ?
+@kindex @key{?}
 You can use command line help by typing @code{help} at the beginning of
 the line.  Typing @kbd{?} at any point in the line will show possible
 completions.
diff --git a/doc/quagga.texi b/doc/quagga.texi
index af82e51..8365071 100644
--- a/doc/quagga.texi
+++ b/doc/quagga.texi
@@ -2,9 +2,9 @@
 
 @c %**start of header
 @setfilename quagga.info
-@settitle @uref{http://www.quagga.net,,@value{PACKAGE_NAME}}
 @c Set variables - sourced from defines.texi
 @include defines.texi
+@settitle @uref{http://www.quagga.net,,@value{PACKAGE_NAME}}
 @c %**end of header
 
 @c automake will automatically generate version.texi