diff --git a/Docs/Makefile.am b/Docs/Makefile.am
index cd539277c70..090467e47cb 100644
--- a/Docs/Makefile.am
+++ b/Docs/Makefile.am
@@ -58,14 +58,18 @@ manual.html:	manual.texi include.texi $(srcdir)/Support/texi2html
 
 # Fix: add --output-comment with some interesting info?
 # Fix: @image worked with a older version of pdftex. 
+# Note: @image will work if we first convert all images to pdf ...
+#       is that worth it?
 # Comment: We need to run pdftex 2 times to get the cross references right.
 manual.pdf: manual.texi
-	cat manual.texi | sed -e 's|@image{[^}]*} *||g' > manual-tmp.texi; \
-	pdftex --interaction=nonstopmode '\input manual-tmp.texi'; \
-	pdftex --interaction=nonstopmode '\pdfcompresslevel=9' \
-					 '\input manual-tmp.texi'; \
-	mv manual-tmp.pdf manual.pdf; \
-	rm -f manual-tmp.* ; \
+	cat manual.texi | sed -e 's|@image{[^}]*} *||g' > manual-tmp.texi
+	pdftex --interaction=nonstopmode manual-tmp.texi
+	texindex manual-tmp.??
+	pdftex --interaction=nonstopmode manual-tmp.texi
+	texindex manual-tmp.??
+	pdftex --interaction=nonstopmode manual-tmp.texi
+	mv manual-tmp.pdf manual.pdf
+	rm -f manual-tmp.*
 	touch $@
 
 # Target to produce NuSphere Manual
@@ -75,12 +79,14 @@ nusphere.pdf: manual.texi
 	      -e 's/@end example/@end smallexample/g' \
 	      -e 's/@c ifnusphere //g' \
 	      -e 's|@image{[^}]*} *||g' \
-	> manual-tmp.texi; \
-	pdftex --interaction=nonstopmode '\input manual-tmp.texi'; \
-	pdftex --interaction=nonstopmode '\pdfcompresslevel=9' \
-					 '\input manual-tmp.texi'; \
-	mv manual-tmp.pdf nusphere.pdf; \
-	rm -f manual-tmp.* ; \
+	> manual-tmp.texi
+	pdftex --interaction=nonstopmode manual-tmp.texi
+	texindex manual-tmp.??
+	pdftex --interaction=nonstopmode manual-tmp.texi
+	texindex manual-tmp.??
+	pdftex --interaction=nonstopmode manual-tmp.texi
+	mv manual-tmp.pdf nusphere.pdf
+	rm -f manual-tmp.*
 	touch $@
 
 # The texi2dvi gives a lot of harmless errors. Just ignore them unless
diff --git a/Docs/manual.texi b/Docs/manual.texi
index 032b75ebee7..f47aea41a18 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -42348,6 +42348,16 @@ All new development is concentrated to @strong{MySQL}.
 
 @page
 @c This node name is special
+
+@ifset nusphere
+@node GPL license, LGPL license, Unireg, Top
+@appendix GNU General Public License
+
+The GPL License can be found at ...
+
+@end ifset
+
+@ifclear nusphere
 @node GPL license, LGPL license, Unireg, Top
 @appendix GNU General Public License
 
@@ -42693,8 +42703,19 @@ library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.
 
 @end example
+@end ifclear
 
 @page
+
+@ifset nusphere
+@node LGPL license, Function Index, GPL license, Top
+@appendix GNU Library General Public License
+
+The LGPL License can be found at ...
+
+@end ifset
+
+@ifclear nusphere
 @node LGPL license, Function Index, GPL license, Top
 @appendix GNU Library General Public License
 
@@ -43181,6 +43202,7 @@ necessary.  Here is a sample; alter the names:
 
 That's all there is to it!
 @end example
+@end ifclear
 
 @node Function Index, Concept Index, LGPL license, Top
 @unnumbered SQL command, type and function index