diff --git a/legacy/evas/ChangeLog b/legacy/evas/ChangeLog
index 3e796e7278..23f0ae3260 100644
--- a/legacy/evas/ChangeLog
+++ b/legacy/evas/ChangeLog
@@ -135,3 +135,8 @@
 2011-02-27  Vincent Torri
 
 	* Fixed static linking of the bmp, wbmp and tga loaders
+
+2011-03-07  Mike Blumenkrantz
+
+        * Fix segv when trying to set gl viewpoint with NULL ctx
+        * Add more verbose error message when glXMakeCurrent fails
diff --git a/legacy/evas/src/modules/engines/gl_x11/evas_engine.h b/legacy/evas/src/modules/engines/gl_x11/evas_engine.h
index 30a0c04457..ae9ccbd256 100644
--- a/legacy/evas/src/modules/engines/gl_x11/evas_engine.h
+++ b/legacy/evas/src/modules/engines/gl_x11/evas_engine.h
@@ -24,7 +24,7 @@
 #   include <X11/Xutil.h>
 #   include <X11/extensions/Xrender.h>
 #   include <X11/Xresource.h> // xres - dpi
-#endif
+#  endif
 # else
 #  include <X11/Xlib.h>
 #  include <X11/Xatom.h>
@@ -32,6 +32,7 @@
 #  include <X11/extensions/Xrender.h>
 #  include <X11/Xresource.h> // xres - dpi
 #  include <GL/gl.h>
+#  include <GL/glu.h>
 #  include <GL/glext.h>
 #  include <GL/glx.h>
 # endif
diff --git a/legacy/evas/src/modules/engines/gl_x11/evas_x_main.c b/legacy/evas/src/modules/engines/gl_x11/evas_x_main.c
index 95437dd2c6..28a13eff40 100644
--- a/legacy/evas/src/modules/engines/gl_x11/evas_x_main.c
+++ b/legacy/evas/src/modules/engines/gl_x11/evas_x_main.c
@@ -300,7 +300,7 @@ eng_window_new(Display *disp,
           {
              if (!glXMakeCurrent(gw->disp, gw->win, gw->context))
                {
-                  printf("Error: glXMakeCurrent(%p, 0x%x, %p) failed\n", (void *)gw->disp, (unsigned int)gw->win, (void *)gw->context);
+                  printf("Error: glXMakeCurrent(%p, 0x%x, %p) failed - '%s'\n", (void *)gw->disp, (unsigned int)gw->win, (void *)gw->context, gluErrorString(glGetError()));
                   eng_window_free(gw);
                   return NULL;
                }
@@ -531,7 +531,7 @@ eng_window_use(Evas_GL_X11_Window *gw)
 #endif
          }
      }
-   if (gw) evas_gl_common_context_use(gw->gl_context);
+   if (gw && gw->gl_context) evas_gl_common_context_use(gw->gl_context);
 }
 
 void