diff --git a/manual/Makefile.pdflatex b/manual/Makefile.pdflatex
index b5e30dedf6..c351f82fb5 100644
--- a/manual/Makefile.pdflatex
+++ b/manual/Makefile.pdflatex
@@ -17,6 +17,7 @@ buildmanual: rockbox-build.tex pdf
 buildhtml: rockbox-build.tex
 	@mkdir -p $(OBJDIR)/html
 	@$(HTLATEX) $(DOCUMENT) "$(HTOPTS1),$(SPLITHTML)" $(HTOPTS2) $(HTOPTS3)
+	@cp --parent `cat $(OBJDIR)/html/*.html | sed -e '/\.js/!d;s/.*\"\(.*\.js\)\".*/\1/g;/</d' | uniq` $(OBJDIR)/html
 	@cp --parent `cat $(OBJDIR)/html/*.html | sed -e '/[pj][np]g/!d;s/.*\"\(.*\.[pj][np]g\)\".*/\1/g;/</d'` $(OBJDIR)/html
 	@cp -r $(OBJDIR)/html $(OBJDIR)/../
 
diff --git a/manual/gsearch.js b/manual/gsearch.js
new file mode 100644
index 0000000000..9b5e3f7aa1
--- /dev/null
+++ b/manual/gsearch.js
@@ -0,0 +1,11 @@
+function gsearch() {
+    var expr=/(.*)\/([^/]+)$/;
+    var loc = expr.exec(window.location)[1];
+    document.getElementById("gsearch").innerHTML = ''
+    + '<form action="http://www.google.com/search">'
+    + 'Search this manual '
+    + '<input name="as_q" size="30">'
+    + '<input value="Google it" type="submit">'
+    + '<input type="hidden" name="as_sitesearch" value="' + loc + '">'
+    + '</form>';
+}
diff --git a/manual/rockbox-html.cfg b/manual/rockbox-html.cfg
index 284bcb36e4..2572125887 100644
--- a/manual/rockbox-html.cfg
+++ b/manual/rockbox-html.cfg
@@ -12,9 +12,16 @@ div.center { margin-left:auto; margin-right:auto; }
 .fancyvrb { background-color:\#c6d6f5; }
 table.multicols { width:95\%; margin-left:auto; margin-right:auto; text-align:justify; }
 .crosslinks { color:\#ffffff; text-align:center; background-color:\#6887bb; padding:8px; }
-div.crosslinks>p>a { color:\#ffffff; }
+div.crosslinks>a { color:\#ffffff; }
 hr { display:none; }
 }
 \EndPreamble
 \Configure{Link}{a}{href=}{name=}{}
-
+\Configure{@HEAD}{\HCode{<script type="text/javascript" src="gsearch.js"></script>}}
+\Configure{BODY}{\HCode{<body onload="gsearch();">}}{\HCode{</body>}}
+\Configure{crosslinks*}{next}{up}{prev}{}
+\Configure{crosslinks+}%
+{\HCode{<div style='float:left;'><a href='http://www.rockbox.org'><img src='http://www.rockbox.org/rockbox100.png'/></a></div><div id='gsearch' style='float:right;'>Enable JavaScript to show search field.</div><div style='clear:both;' class='crosslinks'>}}%
+{\HCode{</div>}}%
+{\HCode{<div class='crosslinks'>}}%
+{\HCode{</div>}}
