diff --git a/ChangeLog b/ChangeLog
index 6c6b6734a..34a8e17c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-14  Matthew Allum  <mallum@openedhand.com>
+
+	* configure.ac:
+	Add checks for GL/gl.h and GL/glx.h
+
 2006-06-14  Matthew Allum  <mallum@openedhand.com>
 
 	* AUTHORS:
diff --git a/configure.ac b/configure.ac
index a07a6b29b..08f324b0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,6 +73,9 @@ then
    AC_DEFINE([XTHREADS], [], [1])
 fi
 
+AC_CHECK_HEADERS([GL/gl.h GL/glx.h],, 
+	         [AC_MSG_ERROR([Unable to locate required GL headers])])
+
 AC_CHECK_LIB(GL, glXCreateContext, HAVE_LIBGL=yes, HAVE_LIBGL=no)
 
 if test "x$HAVE_LIBGL" = "xno"; then