diff --git a/experimental/ecdb/trunk/src/ecdb_gui.c b/experimental/ecdb/trunk/src/ecdb_gui.c
index a5ca4437..cda69dce 100644
--- a/experimental/ecdb/trunk/src/ecdb_gui.c
+++ b/experimental/ecdb/trunk/src/ecdb_gui.c
@@ -182,13 +182,21 @@ ecdb_create_main_gui(void)
 {
    Evas_Object *gui;
    Evas_Coord mw, mh;
-   const char *scale;
+   const char *scale, *engine;
    float scalef;
 
-   /* This would be wonderful, but its a bit glitchy
-   em->main_win_ee = ecore_evas_gl_x11_new(0, 0, 0, 0, 255, 255);
-   */
-   em->main_win_ee = ecore_evas_software_x11_new(0, 0, 0, 0, 255, 255);
+   engine = getenv("ECDB_ENGINE");
+   if (engine)
+   {
+      if (!strcmp(engine, "gl"))
+         em->main_win_ee = ecore_evas_gl_x11_new(0, 0, 0, 0, 255, 255);
+      else if (!strcmp(engine, "xr"))
+         em->main_win_ee = ecore_evas_xrender_x11_new(0, 0, 0, 0, 255, 255);
+      else if (!strcmp(engine, "x11"))
+         em->main_win_ee = ecore_evas_software_x11_new(0, 0, 0, 0, 255, 255);
+   }
+   else
+      em->main_win_ee = ecore_evas_software_x11_new(0, 0, 0, 0, 255, 255);
 
    if (!em->main_win_ee)
    {