diff --git a/dillorc b/dillorc
index b990ea5..2987a77 100644
--- a/dillorc
+++ b/dillorc
@@ -109,11 +109,14 @@
 # home="file:/home/jcid/HomePage/Home.html"
 #home="http://www.dillo.org/"
 
-# Set the URL used by the web search dialog.
+# Set the URLs used by the web search dialog.
 # "%s" is replaced with the search keywords separated by '+'.
-# search_url="http://www.wikipedia.org/wiki/Special:Search?search=%s"
-# search_url="http://search.lycos.com/?query=%s"
-# search_url="http://duckduckgo.com/html?q=%s"
+# Format: search_url="[<label> ]<url>"
+# You can have several search engines, with the first being the default.
+# e.g.
+# search_url="DuckDuckGo http://duckduckgo.com/html?q=%s"
+# search_url="Wikipedia http://www.wikipedia.org/wiki/Special:Search?search=%s"
+# search_url="Lycos http://search.lycos.com/?query=%s"
 #search_url="http://www.google.com/search?ie=UTF-8&oe=UTF-8&q=%s"
 
 # If set, dillo will ask web servers to send pages in this language.
diff --git a/dw/fltkplatform.cc b/dw/fltkplatform.cc
index d28dbde..a949f21 100644
--- a/dw/fltkplatform.cc
+++ b/dw/fltkplatform.cc
@@ -123,7 +123,9 @@
    font = family->get (fa);
 
    fl_font(font, size);
-   spaceWidth = misc::max(0, (int)fl_width(' ') + letterSpacing);
+   /* WORKAROUND: fl_width(uint_t) is not working on non-xft X.
+    * Reported to FLTK as STR #2688 */
+   spaceWidth = misc::max(0, (int)fl_width(" ") + letterSpacing);
    int xx, xy, xw, xh;
    fl_text_extents("x", xx, xy, xw, xh);
    xHeight = xh;
@@ -159,7 +161,7 @@
       if (t & FL_BOLD)
          strstrip(name, " bold");
 
-      MSG("Found font: %s%s%s\n", name, t & FL_BOLD ? " bold" : "",
+      _MSG("Found font: %s%s%s\n", name, t & FL_BOLD ? " bold" : "",
                                   t & FL_ITALIC ? " italic" : "");
 
       object::String *familyName = new object::String(name);
diff --git a/dw/fltkui.cc b/dw/fltkui.cc
index 5405d92..788df08 100644
--- a/dw/fltkui.cc
+++ b/dw/fltkui.cc
@@ -539,8 +539,10 @@
    if (displayed() && style) {
       FltkFont *font = (FltkFont*)style->font;
       fl_font(font->font,font->size);
+      /* WORKAROUND: fl_width(uint_t) is not working on non-xft X.
+       * Reported to FLTK as STR #2688 */
       requisition->width =
-         (int)fl_width ('n')
+         (int)fl_width ("n")
          * (maxLength == UNLIMITED_MAX_LENGTH ? 10 : maxLength)
          + label_w + (2 * RELIEF_X_THICKNESS);
       requisition->ascent = font->ascent + RELIEF_Y_THICKNESS;
@@ -657,8 +659,10 @@
    if (style) {
       FltkFont *font = (FltkFont*)style->font;
       fl_font(font->font,font->size);
+      /* WORKAROUND: fl_width(uint_t) is not working on non-xft X.
+       * Reported to FLTK as STR #2688 */
       requisition->width =
-         (int)fl_width ('n') * numCols + 2 * RELIEF_X_THICKNESS;
+         (int)fl_width ("n") * numCols + 2 * RELIEF_X_THICKNESS;
       requisition->ascent =
          RELIEF_Y_THICKNESS + font->ascent +
          (font->ascent + font->descent) * (numRows - 1);
diff --git a/src/dialog.cc b/src/dialog.cc
index 9b3f8db..85121c6 100644
--- a/src/dialog.cc
+++ b/src/dialog.cc
@@ -22,6 +22,8 @@
 #include <FL/Fl_Output.H>
 #include <FL/Fl_Input.H>
 #include <FL/Fl_Secret_Input.H>
+#include <FL/Fl_Choice.H>
+#include <FL/Fl_Menu_Item.H>
 
 #include "msg.h"
 #include "dialog.hh"
@@ -75,6 +77,25 @@
    }
    return Fl_Input::handle(e);
 }
+
+/*
+ * Used to make the ENTER key activate the CustChoice
+ */
+class CustChoice : public Fl_Choice {
+public:
+   CustChoice (int x, int y, int w, int h, const char* l=0) :
+      Fl_Choice(x,y,w,h,l) {};
+   int handle(int e) {
+      if (e == FL_KEYBOARD &&
+          (Fl::event_key() == FL_Enter || Fl::event_key() == FL_Down) &&
+          (Fl::event_state() & (FL_SHIFT|FL_CTRL|FL_ALT|FL_META)) == 0) {
+         MSG("CustChoice: ENTER\n");
+         return Fl_Choice::handle(FL_PUSH);
+      }
+      return Fl_Choice::handle(e);
+   };
+};
+
 //----------------------------------------------------------------------------
 
 
@@ -104,6 +125,7 @@
  */
 const char *a_Dialog_input(const char *msg)
 {
+   static Fl_Menu_Item *pm = 0;
    int ww = 450, wh = 130, gap = 10, ih = 60, bw = 80, bh = 30;
 
    input_answer = 0;
@@ -134,6 +156,24 @@
     c_inp->labelsize(14);
     c_inp->textsize(14);
 
+    CustChoice *ch = new CustChoice(1*gap,ih+3*gap,180,24);
+    if (!pm) {
+       int n_it = dList_length(prefs.search_urls);
+       pm = new Fl_Menu_Item[n_it+1];
+       memset(pm, '\0', sizeof(Fl_Menu_Item[n_it+1]));
+       for (int i = 0, j = 0; i < n_it; i++) {
+          char *label, *url, *source;
+          source = (char *)dList_nth_data(prefs.search_urls, i);
+          if (a_Misc_parse_search_url(source, &label, &url) < 0)
+             continue;
+          pm[j++].label(FL_NORMAL_LABEL, strdup(label));
+       }
+    }
+    ch->tooltip("Select search engine");
+    ch->menu(pm);
+    ch->value(prefs.search_url_idx);
+    ch->textcolor(FL_DARK_BLUE);
+
     int xpos = ww-2*(gap+bw), ypos = ih+3*gap;
     Fl_Return_Button *rb = new Fl_Return_Button(xpos, ypos, bw, bh, "OK");
     rb->align(FL_ALIGN_INSIDE|FL_ALIGN_CLIP);
@@ -156,6 +196,8 @@
       /* we have a string, save it */
       dFree(input_str);
       input_str = dStrdup(c_inp->value());
+      MSG("a_Dialog_input value() = %d\n", ch->value());
+      prefs.search_url_idx = ch->value();
    }
    delete window;
 
diff --git a/src/form.cc b/src/form.cc
index bf1f8e3..9b86fcb 100644
--- a/src/form.cc
+++ b/src/form.cc
@@ -611,7 +611,6 @@
 
 /*
  * The textarea tag
- * (TODO: It doesn't support wrapping).
  */
 void Html_tag_open_textarea(DilloHtml *html, const char *tag, int tagsize)
 {
diff --git a/src/misc.c b/src/misc.c
index 213b0ad..ef64e87 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -383,6 +383,38 @@
 }
 
 /*
+ * Parse dillorc's search_url string ("[<label> ]<url>")
+ * Return value: -1 on error, 0 on success (and label and urlstr pointers)
+ */
+int a_Misc_parse_search_url(char *source, char **label, char **urlstr)
+{
+   static char buf[32];
+   char *p, *q;
+   int ret = -1;
+
+   if ((p = strrchr(source, ' '))) {
+      /* label and url pair */
+      strncpy(buf,source,MIN(p-source,31));
+      buf[MIN(p-source,31)] = 0;
+      source = p+1;
+      if ((p = strchr(source, '/')) && p[1] && (q = strchr(p+2,'/'))) {
+         *urlstr = source;
+         ret = 0;
+      }
+   } else {
+      /* url only, make a custom label */
+      if ((p = strchr(source, '/')) && p[1] && (q = strchr(p+2,'/'))) {
+         strncpy(buf,p+2,MIN(q-p-2,31));
+         buf[MIN(q-p-2,31)] = 0;
+         *urlstr = source;
+         ret = 0;
+      }
+   }
+   *label = buf;
+   return ret;
+}
+
+/*
  * Encodes string using base64 encoding.
  * Return value: new string or NULL if input string is empty.
  */
diff --git a/src/misc.h b/src/misc.h
index 0b4eaaa..75f0f78 100644
--- a/src/misc.h
+++ b/src/misc.h
@@ -17,6 +17,7 @@
                                char **charset);
 int a_Misc_content_type_cmp(const char* ct1, const char *ct2);
 int a_Misc_parse_geometry(char *geom, int *x, int *y, int *w, int *h);
+int a_Misc_parse_search_url(char *source, char **label, char **urlstr);
 char *a_Misc_encode_base64(const char *in);
 Dstr *a_Misc_file2dstr(const char *filename);
 
diff --git a/src/prefs.c b/src/prefs.c
index be0882b..cbd1f5d 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -75,7 +75,10 @@
    prefs.panel_size = P_medium;
    prefs.parse_embedded_css=TRUE;
    prefs.save_dir = dStrdup(PREFS_SAVE_DIR);
-   prefs.search_url = dStrdup(PREFS_SEARCH_URL);
+   prefs.search_urls = dList_new(16);
+   dList_append(prefs.search_urls, dStrdup(PREFS_SEARCH_URL));
+   dList_append(prefs.search_urls, NULL); /* flags a default search URL */
+   prefs.search_url_idx = 0;
    prefs.show_back = TRUE;
    prefs.show_bookmarks = TRUE;
    prefs.show_clear_url = TRUE;
@@ -104,6 +107,8 @@
  */
 void a_Prefs_freeall(void)
 {
+   int i;
+
    dFree(prefs.font_cursive);
    dFree(prefs.font_fantasy);
    dFree(prefs.font_monospace);
@@ -117,6 +122,8 @@
    dFree(prefs.http_user_agent);
    dFree(prefs.no_proxy);
    dFree(prefs.save_dir);
-   dFree(prefs.search_url);
+   for (i = 0; i < dList_length(prefs.search_urls); ++i)
+      dFree(dList_nth_data(prefs.search_urls, i));
+   dList_free(prefs.search_urls);
    a_Url_free(prefs.start_page);
 }
diff --git a/src/prefs.h b/src/prefs.h
index 4debee8..19e3890 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -85,7 +85,8 @@
    bool_t enterpress_forces_submit;
    bool_t middle_click_opens_new_tab;
    bool_t right_click_closes_tab;
-   char *search_url;
+   bool_t search_url_idx;
+   Dlist *search_urls;
    char *save_dir;
    bool_t show_msg;
    bool_t show_extra_warnings;
diff --git a/src/prefsparser.cc b/src/prefsparser.cc
index 9d24570..bf97322 100644
--- a/src/prefsparser.cc
+++ b/src/prefsparser.cc
@@ -24,6 +24,7 @@
    PREFS_BOOL,
    PREFS_COLOR,
    PREFS_STRING,
+   PREFS_STRINGS,
    PREFS_URL,
    PREFS_INT32,
    PREFS_DOUBLE,
@@ -86,7 +87,7 @@
       { "panel_size", &prefs.panel_size, PREFS_PANEL_SIZE },
       { "parse_embedded_css", &prefs.parse_embedded_css, PREFS_BOOL },
       { "save_dir", &prefs.save_dir, PREFS_STRING },
-      { "search_url", &prefs.search_url, PREFS_STRING },
+      { "search_url", &prefs.search_urls, PREFS_STRINGS },
       { "show_back", &prefs.show_back, PREFS_BOOL },
       { "show_bookmarks", &prefs.show_bookmarks, PREFS_BOOL },
       { "show_clear_url", &prefs.show_clear_url, PREFS_BOOL },
@@ -134,6 +135,19 @@
       dFree(*(char **)node->pref);
       *(char **)node->pref = dStrdup(value);
       break;
+   case PREFS_STRINGS:
+   {
+      Dlist *lp = *(Dlist **)node->pref;
+      if (dList_length(lp) == 2 && !dList_nth_data(lp, 1)) {
+         /* override the default */
+         void *data = dList_nth_data(lp, 0);
+         dList_remove(lp, data);
+         dList_remove(lp, NULL);
+         dFree(data);
+      }
+      dList_append(lp, dStrdup(value));
+      break;
+   }
    case PREFS_URL:
       a_Url_free(*(DilloUrl **)node->pref);
       *(DilloUrl **)node->pref = a_Url_new(value, NULL);
diff --git a/src/uicmd.cc b/src/uicmd.cc
index f257d53..43dee78 100644
--- a/src/uicmd.cc
+++ b/src/uicmd.cc
@@ -36,6 +36,7 @@
 #include "history.h"
 #include "msg.h"
 #include "prefs.h"
+#include "misc.h"
 
 #include "dw/fltkviewport.hh"
 
@@ -774,16 +775,20 @@
 
 /*
  * Returns a newly allocated string holding a search url generated from
- * a string of keywords (separarated by blanks) and prefs.search_url.
+ * a string of keywords (separated by blanks) and the current search_url.
  * The search string is urlencoded.
  */
 static char *UIcmd_make_search_str(const char *str)
 {
-   char *keys = a_Url_encode_hex_str(str), *c = prefs.search_url;
+   char *search_url, *l, *u, *c;
+   char *keys = a_Url_encode_hex_str(str),
+        *src = (char*)dList_nth_data(prefs.search_urls, prefs.search_url_idx);
    Dstr *ds = dStr_sized_new(128);
-   char *search_url;
-
-   for (; *c; c++) {
+
+   /* parse search_url into label and url */
+   a_Misc_parse_search_url(src, &l, &u);
+
+   for (c = u; *c; c++) {
       if (*c == '%')
          switch(*++c) {
          case 's':