diff --git a/Makefile b/Makefile
index 31cc2e2c02..0f17e39454 100644
--- a/Makefile
+++ b/Makefile
@@ -232,7 +232,10 @@ ifeq ($(HAVE_OPENGL), 1)
 	
    ifeq ($(HAVE_GLES), 1)
       LIBS += $(GLES_LIBS)
-      DEFINES += $(GLES_CFLAGS) -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_OPENGLES3
+      DEFINES += $(GLES_CFLAGS) -DHAVE_OPENGLES -DHAVE_OPENGLES2
+      ifeq ($(HAVE_GLES3), 1)
+         DEFINES += -DHAVE_OPENGLES3
+      endif
       OBJ += gfx/glsym/glsym_es2.o
    else
       DEFINES += -DHAVE_GL_SYNC
diff --git a/qb/config.libs.sh b/qb/config.libs.sh
index 06fa85d44a..9ceeeecee2 100644
--- a/qb/config.libs.sh
+++ b/qb/config.libs.sh
@@ -268,6 +268,6 @@ add_define_make OS "$OS"
 
 # Creates config.mk and config.h.
 add_define_make GLOBAL_CONFIG_DIR "$GLOBAL_CONFIG_DIR"
-VARS="RGUI ALSA OSS OSS_BSD OSS_LIB AL RSOUND ROAR JACK COREAUDIO PULSE SDL OPENGL OMAP GLES VG EGL KMS GBM DRM DYLIB GETOPT_LONG THREADS CG LIBXML2 SDL_IMAGE ZLIB DYNAMIC FFMPEG AVCODEC AVFORMAT AVUTIL SWSCALE FREETYPE XKBCOMMON XVIDEO X11 XEXT XF86VM XINERAMA NETPLAY NETWORK_CMD STDIN_CMD COMMAND SOCKET_LEGACY FBO STRL STRCASESTR MMAP PYTHON FFMPEG_ALLOC_CONTEXT3 FFMPEG_AVCODEC_OPEN2 FFMPEG_AVIO_OPEN FFMPEG_AVFORMAT_WRITE_HEADER FFMPEG_AVFORMAT_NEW_STREAM FFMPEG_AVCODEC_ENCODE_AUDIO2 FFMPEG_AVCODEC_ENCODE_VIDEO2 BSV_MOVIE VIDEOCORE NEON FLOATHARD FLOATSOFTFP UDEV V4L2"
+VARS="RGUI ALSA OSS OSS_BSD OSS_LIB AL RSOUND ROAR JACK COREAUDIO PULSE SDL OPENGL OMAP GLES GLES3 VG EGL KMS GBM DRM DYLIB GETOPT_LONG THREADS CG LIBXML2 SDL_IMAGE ZLIB DYNAMIC FFMPEG AVCODEC AVFORMAT AVUTIL SWSCALE FREETYPE XKBCOMMON XVIDEO X11 XEXT XF86VM XINERAMA NETPLAY NETWORK_CMD STDIN_CMD COMMAND SOCKET_LEGACY FBO STRL STRCASESTR MMAP PYTHON FFMPEG_ALLOC_CONTEXT3 FFMPEG_AVCODEC_OPEN2 FFMPEG_AVIO_OPEN FFMPEG_AVFORMAT_WRITE_HEADER FFMPEG_AVFORMAT_NEW_STREAM FFMPEG_AVCODEC_ENCODE_AUDIO2 FFMPEG_AVCODEC_ENCODE_VIDEO2 BSV_MOVIE VIDEOCORE NEON FLOATHARD FLOATSOFTFP UDEV V4L2"
 create_config_make config.mk $VARS
 create_config_header config.h $VARS
diff --git a/qb/config.params.sh b/qb/config.params.sh
index 3219a54758..3123d875fd 100644
--- a/qb/config.params.sh
+++ b/qb/config.params.sh
@@ -12,6 +12,7 @@ HAVE_DYLIB=auto         # Enable dynamic loading support
 HAVE_NETPLAY=auto       # Enable netplay support
 HAVE_OPENGL=yes         # Disable OpenGL support
 HAVE_GLES=no            # Use GLESv2 instead of desktop GL
+HAVE_GLES3=no           # Enable OpenGLES3 support
 HAVE_X11=auto           # Disable everything X11.
 HAVE_OMAP=no            # Enable OMAP video support
 HAVE_XINERAMA=auto      # Disable Xinerama support.