diff --git a/configure.ac b/configure.ac
index 55f8fd8497..2f19c2f5b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -197,6 +197,12 @@ if test "$with_network" = "no"; then
 fi
 AM_CONDITIONAL(WITHOUT_NETWORKING, test "$with_network" = "no")
 
+AC_ARG_WITH(gles2, AS_HELP_STRING([--without-gles2],[Disable OpenGL ES 2.0]), with_network=$withval, with_network=yes)
+if test "$with_gles2" = "no"; then
+	AC_DEFINE(WITHOUT_GLES2, 1, [OpenGL ES 2.0 support not available])
+fi
+AM_CONDITIONAL(WITHOUT_GLES2, test "$with_gles2" = "no")
+
 SM_ZLIB
 SM_BZIP
 SM_AUDIO
diff --git a/src/Makefile.am b/src/Makefile.am
index 350a5b6f90..11f52385fa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -414,7 +414,9 @@ RageFileDriverSlice.cpp RageFileDriverSlice.h \
 RageFileDriverTimeout.cpp RageFileDriverTimeout.h
 
 Rage = $(PCRE) $(Lua) $(jsoncpp) $(RageFile) $(RageSoundFileReaders) \
-RageBitmapTexture.cpp RageBitmapTexture.h RageDisplay.cpp RageDisplay.h RageDisplay_OGL.cpp RageDisplay_OGL.h \
+RageBitmapTexture.cpp RageBitmapTexture.h \
+RageDisplay.cpp RageDisplay.h \
+RageDisplay_OGL.cpp RageDisplay_OGL.h \
 RageDisplay_OGL_Helpers.cpp RageDisplay_OGL_Helpers.h glext.h \
 RageDisplay_Null.cpp RageDisplay_Null.h RageException.cpp RageException.h RageInput.cpp RageInput.h \
 RageInputDevice.cpp RageInputDevice.h RageLog.cpp RageLog.h RageMath.cpp RageMath.h \
@@ -622,6 +624,10 @@ main_SOURCES = $(PNG) \
 		$(Actors) \
 		$(GlobalSingletons)
 
+if !WITHOUT_GLES2
+main_SOURCES += RageDisplay_GLES2.cpp RageDisplay_GLES2.h
+endif
+
 main_LDADD = \
 		$(VIDEO_LIBS) \
 		$(AUDIO_LIBS) \