diff --git a/doc/Makefile.am b/doc/Makefile.am
index 86138baf82..9016df7372 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -52,7 +52,7 @@ info_TEXINFOS = frr.texi
 # because it cant just work from the png's directly it seems - contrary
 # to the documentation...
 frr.pdf: $(info_TEXINFOS) $(figures_pdf) $(frr_TEXINFOS) defines.texi
-	$(TEXI2PDF) -o "$@" $< || true
+	$(TEXI2PDF) -o "$@" $<
 
 # don't ask me why the info file is in srcdir
 $(srcdir)/frr.info: $(frr_TEXINFOS) defines.texi
diff --git a/doc/bgpd.texi b/doc/bgpd.texi
index 8e0da12949..d6b07a270f 100644
--- a/doc/bgpd.texi
+++ b/doc/bgpd.texi
@@ -698,8 +698,11 @@ This command is deprecated and may be removed in a future release. Its
 use should be avoided.
 @end deffn
 
-@deffn {BGP} {neighbor @var{peer} next-hop-self [all]} {}
-@deffnx {BGP} {no neighbor @var{peer} next-hop-self [all]} {}
+@c for some reason, using [all] here triggers a bug in texinfo...
+@deffn {BGP} {neighbor @var{peer} next-hop-self} {}
+@deffnx {BGP} {no neighbor @var{peer} next-hop-self} {}
+@deffnx {BGP} {neighbor @var{peer} next-hop-self all} {}
+@deffnx {BGP} {no neighbor @var{peer} next-hop-self all} {}
 This command specifies an announced route's nexthop as being equivalent
 to the address of the bgp router if it is learned via eBGP.
 If the optional keyword @code{all} is specified the modifiation is done