diff --git a/mozilla/xpfe/components/search/datasets/google.src b/mozilla/xpfe/components/search/datasets/google.src
index bd129288efb..c11e51bf39a 100644
--- a/mozilla/xpfe/components/search/datasets/google.src
+++ b/mozilla/xpfe/components/search/datasets/google.src
@@ -1,4 +1,4 @@
-# Mozilla/Google plug-in by amitp@google.com
+# Mozilla/Google plug-in by amitp+mozilla@google.com
 
 <search 
    name="Google"
@@ -7,15 +7,20 @@
    action="http://www.google.com/search"
    update="http://www.google.com/mozilla/google.src"
    updateCheckDays=1   
+   queryEncoding="utf-8"
+   queryCharset="utf-8"
 >
 
 <input name="q" user>
 <input name="sourceid" value="mozilla-search">
-<inputnext name="start" factor="20">
-<inputprev name="start" factor="20">
+<inputnext name="start" factor="10">
+<inputprev name="start" factor="10">
+<input name="ie" value="utf-8">
+<input name="oe" value="utf-8">
 
 <interpret 
     browserResultType="result" 
+    charset = "UTF-8"
     resultListStart="<!--a-->" 
     resultListEnd="<!--z-->" 
     resultItemStart="<!--m-->"