diff --git a/extras/Projucer/Source/Project Saving/jucer_ProjectExport_Android.h b/extras/Projucer/Source/Project Saving/jucer_ProjectExport_Android.h
index d7824adbd9..3c586ba574 100644
--- a/extras/Projucer/Source/Project Saving/jucer_ProjectExport_Android.h	
+++ b/extras/Projucer/Source/Project Saving/jucer_ProjectExport_Android.h	
@@ -1038,6 +1038,9 @@ private:
         defines.set ("JUCE_ANDROID_ACTIVITY_CLASSNAME", getJNIActivityClassName().replaceCharacter ('/', '_'));
         defines.set ("JUCE_ANDROID_ACTIVITY_CLASSPATH", "\"" + getJNIActivityClassName() + "\"");
 
+        if (supportsGLv3())
+            defines.set ("JUCE_ANDROID_GL_ES_VERSION_3_0", "1");
+
         return defines;
     }
 
@@ -1072,7 +1075,7 @@ private:
 
         libraries.add ("log");
         libraries.add ("android");
-        libraries.add (androidMinimumSDK.get().getIntValue() >= 18 ? "GLESv3" : "GLESv2");
+        libraries.add (supportsGLv3() ? "GLESv3" : "GLESv2");
         libraries.add ("EGL");
 
         return libraries;
@@ -1264,6 +1267,11 @@ private:
         return escapedArray.joinIntoString (", ");
     }
 
+    bool supportsGLv3() const
+    {
+        return (androidMinimumSDK.get().getIntValue() >= 18);
+    }
+
     //==============================================================================
     Value sdkPath, ndkPath;
     const File AndroidExecutable;
diff --git a/modules/juce_opengl/juce_opengl.h b/modules/juce_opengl/juce_opengl.h
index 0396a40dc5..1e96c24b1e 100644
--- a/modules/juce_opengl/juce_opengl.h
+++ b/modules/juce_opengl/juce_opengl.h
@@ -106,7 +106,12 @@
 #elif JUCE_ANDROID
  #include <android/native_window.h>
  #include <android/native_window_jni.h>
- #include <GLES2/gl2.h>
+ #if JUCE_ANDROID_GL_ES_VERSION_3_0
+  #define JUCE_OPENGL3 1
+  #include <GLES3/gl3.h>
+ #else
+  #include <GLES2/gl2.h>
+ #endif
  #include <EGL/egl.h>
 #endif