diff -ru epiphany/data/epiphany.schemas.in epiphany-new/data/epiphany.schemas.in
--- epiphany/data/epiphany.schemas.in	2009-12-08 15:08:18.633312001 +0000
+++ epiphany-new/data/epiphany.schemas.in	2009-12-08 15:47:46.059315233 +0000
@@ -11,6 +11,17 @@
         <long>Address of the user's home page.</long>
         </locale>
       </schema>
+      <schema>
+        <key>/schemas/apps/epiphany/general/url_search</key>
+        <applyto>/apps/epiphany/general/url_search</applyto>
+        <owner>epiphany</owner>
+        <type>string</type>
+        <default>http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8</default>
+        <locale name="C">
+        <short>URL Search</short>
+        <long>Search string for keywords entered in the URL bar.</long>
+        </locale>
+      </schema>
      <schema>
         <key>/schemas/apps/epiphany/dialogs/history_date_filter</key>
         <applyto>/apps/epiphany/dialogs/history_date_filter</applyto>
diff -ru epiphany/embed/ephy-web-view.c epiphany-new/embed/ephy-web-view.c
--- epiphany/embed/ephy-web-view.c	2009-12-08 15:08:18.634312801 +0000
+++ epiphany-new/embed/ephy-web-view.c	2009-12-08 15:48:22.569067544 +0000
@@ -36,6 +36,7 @@
 #include "ephy-embed-single.h"
 #include "ephy-embed-type-builtins.h"
 #include "ephy-embed-utils.h"
+#include "ephy-prefs.h"
 #include "ephy-marshal.h"
 #include "ephy-permission-manager.h"
 #include "ephy-favicon-cache.h"
@@ -1085,6 +1086,7 @@
 normalize_or_autosearch_url (EphyWebView *view, const char *url)
 {
   char *effective_url;
+  char *url_search;
   SoupURI *soup_uri = NULL;
   EphyWebViewPrivate *priv = view->priv;
 
@@ -1100,10 +1102,18 @@
   if (soup_uri == NULL &&
       priv->non_search_regex &&
       !g_regex_match (priv->non_search_regex, url, 0, NULL)) {
+    url_search = eel_gconf_get_string (CONF_URL_SEARCH);
+
+    if (url_search == NULL || url_search[0] == '\0') {
+      g_free (url_search);
+
+      url_search = g_strdup (_("http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8"));
+    }
     char *query_param = soup_form_encode ("q", url, NULL);
     /* + 2 here is getting rid of 'q=' */
-    effective_url = g_strdup_printf (_("http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8"), query_param + 2);
+    effective_url = g_strdup_printf (url_search, query_param + 2);
     g_free (query_param);
+    g_free (url_search);
   } else
     effective_url = ephy_embed_utils_normalize_address (url);
 
diff -ru epiphany/lib/ephy-prefs.h epiphany-new/lib/ephy-prefs.h
--- epiphany/lib/ephy-prefs.h	2009-12-08 15:08:18.635316401 +0000
+++ epiphany-new/lib/ephy-prefs.h	2009-12-08 15:47:46.107343105 +0000
@@ -31,6 +31,7 @@
 
 /* General */
 #define CONF_GENERAL_HOMEPAGE			"/apps/epiphany/general/homepage"
+#define CONF_URL_SEARCH     			"/apps/epiphany/general/url_search"
 #define CONF_ALWAYS_SHOW_TABS_BAR		"/apps/epiphany/general/always_show_tabs_bar"
 #define CONF_WINDOWS_SHOW_TOOLBARS		"/apps/epiphany/general/show_toolbars"
 #define CONF_WINDOWS_SHOW_BOOKMARKS_BAR		"/apps/epiphany/general/show_bookmarks_bar"
