diff --git a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Android.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Android.h
index bbcef794ba..4ee8474f5d 100644
--- a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Android.h	
+++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Android.h	
@@ -62,6 +62,8 @@ public:
 
         if (getInternetNeeded().toString().isEmpty())
             getInternetNeeded() = true;
+
+        androidDynamicLibs.add ("GLESv1_CM");
     }
 
     //==============================================================================
@@ -241,9 +243,23 @@ private:
             << "  LOCAL_CPPFLAGS += " << createCPPFlags (false) << newLine
             << "endif" << newLine
             << newLine
+            << getDynamicLibs()
+            << newLine
             << "include $(BUILD_SHARED_LIBRARY)" << newLine;
     }
 
+    String getDynamicLibs()
+    {
+        if (androidDynamicLibs.size() == 0)
+            return String::empty;
+
+        String flags ("LOCAL_LDLIBS :=");
+        for (int i = 0; i < androidDynamicLibs.size(); ++i)
+            flags << " -l" << androidDynamicLibs[i];
+
+        return flags + newLine;
+    }
+
     String createIncludePathFlags (const Project::BuildConfiguration& config)
     {
         String flags;
diff --git a/extras/Introjucer/Source/Project Saving/jucer_ProjectExporter.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectExporter.h
index 77fe469d5d..3787916322 100644
--- a/extras/Introjucer/Source/Project Saving/jucer_ProjectExporter.h	
+++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectExporter.h	
@@ -144,6 +144,9 @@ public:
     String msvcPostBuildCommand, msvcPostBuildOutputs;
     String msvcPreBuildDescription, msvcPreBuildCommand;
 
+    //==============================================================================
+    StringArray androidDynamicLibs;
+
     //==============================================================================
     StringArray extraSearchPaths;
 
diff --git a/extras/JuceDemo/Builds/Android/jni/Android.mk b/extras/JuceDemo/Builds/Android/jni/Android.mk
index 22bce1475e..022f0d23fc 100644
--- a/extras/JuceDemo/Builds/Android/jni/Android.mk
+++ b/extras/JuceDemo/Builds/Android/jni/Android.mk
@@ -52,4 +52,6 @@ else
   LOCAL_CPPFLAGS += -fsigned-char -fexceptions -frtti -I "../../JuceLibraryCode" -Os -D "JUCE_ANDROID=1" -D "NDEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_ANDROID_7F0E4A25=1"
 endif
 
+LOCAL_LDLIBS := -lGLESv1_CM
+
 include $(BUILD_SHARED_LIBRARY)
diff --git a/modules/juce_opengl/juce_opengl.cpp b/modules/juce_opengl/juce_opengl.cpp
index 43357276cd..eaca156171 100644
--- a/modules/juce_opengl/juce_opengl.cpp
+++ b/modules/juce_opengl/juce_opengl.cpp
@@ -114,6 +114,10 @@
 
  #undef SIZEOF
  #undef KeyPress
+
+//==============================================================================
+#elif JUCE_ANDROID
+ #include <GLES/glext.h>
 #endif
 
 //==============================================================================
diff --git a/modules/juce_opengl/juce_opengl.h b/modules/juce_opengl/juce_opengl.h
index 92b616588d..e82a054523 100644
--- a/modules/juce_opengl/juce_opengl.h
+++ b/modules/juce_opengl/juce_opengl.h
@@ -65,6 +65,8 @@
 #elif JUCE_MAC
  #include <OpenGL/gl.h>
  #include "OpenGL/glext.h"
+#elif JUCE_ANDROID
+ #include <GLES/gl.h>
 #endif
 
 #ifndef GL_BGRA_EXT