diff --git a/docs/Makefile.in b/docs/Makefile.in
index c7adae5fb76..014e6a07c8e 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -164,19 +164,15 @@ gpl.tex:
 
 latexfigures: $(LATEX_FIGURES)
 
-%.aux: %.tex
-	-$(LATEX) $<
-
-%.idx: %.aux
-	$(MAKEINDEX) $*
-
 $(PDFDIR)/%.pdf: %.pdf
 	mkdir -p $(@D)
 	cp $< $@
 
 # Adobe PDF files
-%.pdf %.aux: %.tex %.aux %.idx latexfigures gpl.tex $(%_IMAGES_PNG)
+%.pdf: %.tex latexfigures gpl.tex $(%_IMAGES_PNG)
 	-$(PDFLATEX) $<
+	-$(PDFLATEX) $<
+	$(MAKEINDEX) $*
 	$(THUMBPDF) $*.pdf
 	-$(PDFLATEX) $<
 
@@ -185,9 +181,11 @@ $(DVIDIR)/%.dvi: %.dvi
 	mkdir -p $(@D)
 	cp $< $@
 
-%.dvi %.aux: %.tex %.aux %.idx gpl.tex $(%_IMAGES_EPS)
+%.dvi: %.tex %.idx gpl.tex $(%_IMAGES_EPS)
 	-$(LATEX) $< 
 	-$(LATEX) $< 
+	$(MAKEINDEX) $*
+	-$(LATEX) $< 
 
 %.eps: %.png
 	$(PNGTOPNM) $< | $(PNMTOPS) > $@
@@ -283,3 +281,5 @@ xslt/expand-sambadoc.xsl: settings.xsl
 xslt/generate-attributions.xsl: 
 xslt/man.xsl:
 xslt/pearson.xsl:
+
+.SECONDARY:
diff --git a/docs/manpages/smbcacls.1.xml b/docs/manpages/smbcacls.1.xml
index 7b76aa2ce54..26bd80d282a 100644
--- a/docs/manpages/smbcacls.1.xml
+++ b/docs/manpages/smbcacls.1.xml
@@ -27,7 +27,7 @@
 		<arg choice="opt">-S acls</arg>
 		<arg choice="opt">-C name</arg>
 		<arg choice="opt">-G name</arg>
-		<arg choice="opt">-n</arg>
+		<arg choice="opt">--numeric</arg>
 		<arg choice="opt">-t</arg>
 		<arg choice="opt">-U username</arg>
 		<arg choice="opt">-h</arg>
@@ -131,7 +131,7 @@
 		
 		
 		<varlistentry>
-		<term>-n</term>
+		<term>--numeric</term>
 		<listitem><para>This option displays all ACL information in numeric 
 		format.  The default is to convert SIDs to names and ACE types 
 		and masks to a readable string format.  </para></listitem>
diff --git a/docs/manpages/smbmount.8.xml b/docs/manpages/smbmount.8.xml
index ffcac0fbfa9..6727a170951 100644
--- a/docs/manpages/smbmount.8.xml
+++ b/docs/manpages/smbmount.8.xml
@@ -135,7 +135,7 @@ password = &lt;value&gt;
 		<varlistentry>
 		<term>port=&lt;arg&gt;</term>
 		<listitem><para>sets the remote SMB port number. The default 
-		is 139. </para></listitem>
+		is 445, fallback is 139. </para></listitem>
 		</varlistentry>