diff --git a/Docs/Makefile.am b/Docs/Makefile.am
index 17def904875..12338e0ed0c 100644
--- a/Docs/Makefile.am
+++ b/Docs/Makefile.am
@@ -96,6 +96,9 @@ nusphere.pdf: manual.texi
 # Target to produce DocBook XML
 mysql.xml: manual.texi include.texi
 	$(MAKEINFO) --force --no-ifinfo --docbook manual.texi
+	mv mysql.xml mysql-tmp.xml
+	Support/docbook-fixup.pl <mysql-tmp.xml >mysql.xml
+	rm -f mysql-tmp.xml
 
 # The texi2dvi gives a lot of harmless errors. Just ignore them unless
 # you want to help with the typesetting part.
diff --git a/Docs/Support/docbook-fixup.pl b/Docs/Support/docbook-fixup.pl
new file mode 100755
index 00000000000..81f1466fb06
--- /dev/null
+++ b/Docs/Support/docbook-fixup.pl
@@ -0,0 +1,41 @@
+#!/usr/bin/perl
+
+sub fix {
+  $str = shift;
+  $str =~ tr/_/-/;
+  return $str;
+};
+
+$data = join "", <STDIN>;
+
+print STDERR "Changing @@ to @...\n";
+$data =~ s/@@/@/gs;
+
+print STDERR "Changing '_' to '-' in references...\n";
+$data =~ s{id=\"(.+?)\"}
+          {"id=\"".&fix($1)."\""}gsex;
+$data =~ s{linkend=\"(.+?)\"}
+          {"linkend=\"".&fix($1)."\""}gsex;
+
+print STDERR "Changing ULINK to SYSTEMITEM...\n";
+$data =~ s{<ulink url=\"(.+?)\"></ulink>}
+          {<systemitem role=\"url\">$1</systemitem>}gs;
+
+print STDERR "Removing INFORMALFIGURE...\n";
+$data =~ s{<informalfigure>(.+?)</informalfigure>}
+          {}gs;
+
+print STDERR "Adding PARA inside ENTRY...\n";
+$data =~ s{<entry>(.+?)</entry>}
+          {<entry><para>$1</para></entry>}gs;
+
+@apx = ("Users", "MySQL-customer-usage", "Credits", "News",
+        "Porting", "GPL-license", "LGPL-license", "Placeholder");
+
+foreach $apx (@apx) {
+  print STDERR "Removing appendix $apx...\n";
+  $data =~ s{<appendix id=\"$apx\">(.+?)</appendix>}
+            {}gs;
+};
+
+print STDOUT $data;
diff --git a/Docs/manual.texi b/Docs/manual.texi
index 3c9882dfc1d..7156d00b59c 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -95,11 +95,6 @@ END-INFO-DIR-ENTRY
 
 @node Top, Introduction, (dir), (dir)
 
-@c @ifhtml
-@c <IMG SRC="Images/mysql-logo.gif">
-@c <!--Image doesn't exist. Can't find suitable replacement. (Matt) -->
-@c @end ifhtml
-
 @ifinfo
 This is a manual for MySQL. This version is about the
 @value{mysql_version} version of MySQL.  You can find a manual
@@ -135,9 +130,7 @@ distribution for that version.
 @end menu
 
 
-
-
-@node Introduction, Installing, Top, Top
+@node Introduction, Installing, Top, (dir)
 @chapter General Information About MySQL
 
 @cindex overview