--- surf-0.4.1/surf.c	2010-06-08 09:06:42.000000000 +0200
+++ surf-0.4.1-mod/surf.c	2010-06-26 09:32:49.000000000 +0200
@@ -55,6 +55,11 @@
 	const Arg arg;
 } Key;
 
+typedef struct {
+	char *token;
+	char *uri;
+} SearchEngine;
+
 static Display *dpy;
 static Atom atoms[AtomLast];
 static Client *clients = NULL;
@@ -86,6 +91,7 @@
 static void linkhover(WebKitWebView *v, const char* t, const char* l, Client *c);
 static void loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c);
 static void loaduri(Client *c, const Arg *arg);
+static gchar *parseuri(const gchar *uri);
 static void navigate(Client *c, const Arg *arg);
 static Client *newclient(void);
 static void newwindow(Client *c, const Arg *arg);
@@ -380,6 +386,18 @@
 	}
 }
 
+gchar *
+parseuri(const gchar *uri) {
+	guint i;
+	for (i = 0; i < LENGTH(searchengines); i++) {
+		if (searchengines[i].token == NULL || searchengines[i].uri == NULL || *(uri + strlen(searchengines[i].token)) != ' ')
+			continue;
+		if (g_str_has_prefix(uri, searchengines[i].token))
+			return g_strdup_printf(searchengines[i].uri, uri + strlen(searchengines[i].token) + 1);
+	}
+	return g_strrstr(uri, "://") ? g_strdup(uri) : g_strdup_printf("http://%s", uri);
+}
+
 void
 loaduri(Client *c, const Arg *arg) {
 	char *u;
@@ -388,8 +406,7 @@
 
 	if(strcmp(uri, "") == 0)
 		return;
-	u = g_strrstr(uri, "://") ? g_strdup(uri)
-		: g_strdup_printf("http://%s", uri);
+	u = parseuri(uri);
 	/* prevents endless loop */
 	if(c->uri && strcmp(u, c->uri) == 0) {
 		reload(c, &a);
--- surf-0.4.1/config.def.h	2010-06-26 09:35:23.000000000 +0200
+++ surf-0.4.1-mod/config.def.h	2010-06-26 09:36:46.000000000 +0200
@@ -8,6 +8,10 @@
 static time_t sessiontime   = 3600;
 #define NOBACKGROUND 0
 
+static SearchEngine searchengines[] = {
+    { "g", "http://www.google.com/search?q=%s" },
+};
+
 #define SETPROP(p, q)     { .v = (char *[]){ "/bin/sh", "-c", \
 	"prop=\"`xprop -id $2 $0 | cut -d '\"' -f 2 | dmenu`\" &&" \
 	"xprop -id $2 -f $1 8s -set $1 \"$prop\"", \