diff --git a/configure.in b/configure.in
index c1aa4fe5a..9189fc5b9 100644
--- a/configure.in
+++ b/configure.in
@@ -788,6 +788,17 @@ CheckX11()
 AC_HELP_STRING([--enable-video-x11], [use X11 video driver [[default=yes]]]),
                   , enable_video_x11=yes)
     if test x$enable_video = xyes -a x$enable_video_x11 = xyes; then
+        case "$host" in
+            *-*-darwin*) # Latest Mac OS X actually ships with Xrandr/Xrender libs...
+                # This isn't strictly necessary for X11, but for GLX detection
+                if test "x$x_includes" = xNONE; then
+                    x_includes="/usr/X11R6/include"
+                fi
+                if test "x$x_libraries" != xNONE; then
+                    x_libraries="/usr/X11R6/lib"
+                fi
+                ;;
+        esac
         AC_PATH_X
         AC_PATH_XTRA
         if test x$have_x = xyes; then