diff --git a/CHANGELOG b/CHANGELOG
index 4f5eb43..57b879c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -26,6 +26,7 @@
 * Change: Remove JMock::REQUIRES, deprecated.
 * Change: Remove ScalaCheck::REQUIRES, deprecated.
 * Change: Change Eclipse Scala project natures from ch.epfl.lamp.sdt.core.scalanature to org.scala-ide.sdt.core.scalanature
+* Change: Fix the custom Google search widget on the website.
 * Added:  Travis badge to README.rdoc
 * Added:  Added Rubygems badges to README.rdoc
 * Added:  BUILDR-577 Allow remote repo to be added with http basic auth support. Submitted by Michael Guymon.
diff --git a/doc/_layouts/default.html b/doc/_layouts/default.html
index 90de68c..32824b3 100644
--- a/doc/_layouts/default.html
+++ b/doc/_layouts/default.html
@@ -63,10 +63,8 @@
             </ol>
           </li>
           <li>
-            <form action='http://www.google.com/cse' id='searchbox_003673095760649043902:ogcgrzu0l2y'>
-              <input name='cx' type='hidden' value='003673095760649043902:ogcgrzu0l2y'>
-              <input name='cof' type='hidden' value='FORID:0'>
-              <input name='q' size='20' type='text'>
+            <form action='http://www.google.com/' onsubmit="document.getElementById('gQuery').value += ' site:buildr.apache.org'">
+              <input name='q' size='20' type='text' id='gQuery'>
               <input name='sa' type='submit' value='Search'>
               <img alt='Google Custom Search' src='http://www.google.com/coop/images/google_custom_search_smnar.gif'>
             </form>