diff --git a/projects/android-project/AndroidManifest.xml b/projects/android-project/AndroidManifest.xml
index a8a58974b..5f4774054 100644
--- a/projects/android-project/AndroidManifest.xml
+++ b/projects/android-project/AndroidManifest.xml
@@ -25,4 +25,7 @@
 
     <!-- Allow writing to external storage -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> 
+    
+    <!-- Allow the usage of the wake lock -->
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
 </manifest> 
diff --git a/projects/android-project/src/org/libsdl/app/SDLActivity.java b/projects/android-project/src/org/libsdl/app/SDLActivity.java
index 8035d11be..794305dd8 100644
--- a/projects/android-project/src/org/libsdl/app/SDLActivity.java
+++ b/projects/android-project/src/org/libsdl/app/SDLActivity.java
@@ -19,7 +19,7 @@ import android.util.Log;
 import android.graphics.*;
 import android.media.*;
 import android.hardware.*;
-
+import android.os.PowerManager;
 
 /**
     SDL Activity
@@ -49,7 +49,8 @@ public class SDLActivity extends Activity {
     protected static EGLDisplay  mEGLDisplay;
     protected static EGLConfig   mEGLConfig;
     protected static int mGLMajor, mGLMinor;
-
+	protected static PowerManager.WakeLock mWakeLock;
+	
     // Load the .so
     static {
 		System.loadLibrary("openal");
@@ -72,6 +73,12 @@ public class SDLActivity extends Activity {
         mLayout.addView(mSurface);
 
         setContentView(mLayout);
+        
+		final PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
+		mWakeLock = pm.newWakeLock(PowerManager.FULL_WAKE_LOCK, "My Tag");
+		mWakeLock.acquire();
+		
+		getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
     }
 
     // Events
@@ -98,6 +105,8 @@ public class SDLActivity extends Activity {
 
     @Override
     protected void onDestroy() {
+		mWakeLock.release();
+		
         super.onDestroy();
         Log.v("SDL", "onDestroy()");
         // Send a quit message to the application
diff --git a/projects/linux/ee.creator.user b/projects/linux/ee.creator.user
index 00e1917d0..fdef19032 100644
--- a/projects/linux/ee.creator.user
+++ b/projects/linux/ee.creator.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 2.8.1, 2013-11-03T22:20:01. -->
+<!-- Written by QtCreator 2.8.1, 2013-11-06T10:44:12. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
diff --git a/src/eepp/graphics/cvertexbuffervbo.cpp b/src/eepp/graphics/cvertexbuffervbo.cpp
index e0f3aede9..a885880fb 100644
--- a/src/eepp/graphics/cvertexbuffervbo.cpp
+++ b/src/eepp/graphics/cvertexbuffervbo.cpp
@@ -48,9 +48,8 @@ bool cVertexBufferVBO::Compile() {
 	if( mCompiled )
 		return false;
 
-	#ifndef EE_GLES
 	GLint curVAO = 0;
-
+	#ifndef EE_GLES
 	if ( GLv_3CP == GLi->Version() ) {
 		glGetIntegerv( GL_VERTEX_ARRAY_BINDING, &curVAO );
 		GLi->GenVertexArrays( 1, &mVAO );
@@ -109,9 +108,8 @@ void cVertexBufferVBO::Draw() {
 	if ( !mCompiled )
 		return;
 
-	#ifndef EE_GLES
 	GLint curVAO = 0;
-
+	#ifndef EE_GLES
 	if ( GLv_3CP == GLi->Version() ) {
 		glGetIntegerv( GL_VERTEX_ARRAY_BINDING, &curVAO );
 		GLi->BindVertexArray( mVAO );
@@ -149,9 +147,8 @@ void cVertexBufferVBO::SetVertexStates() {
 	GLint index;
 	#endif
 
-	#ifndef EE_GLES
 	GLint curVAO = 0;
-
+	#ifndef EE_GLES
 	if ( GLv_3CP == GLi->Version() ) {
 		if ( mBuffersSet ) {
 			return;