diff --git a/android/.classpath b/android/.classpath
index a4763d1eec..08607161fe 100644
--- a/android/.classpath
+++ b/android/.classpath
@@ -4,5 +4,6 @@
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/android/.project b/android/.project
index 4af1961cac..f67bf8570b 100644
--- a/android/.project
+++ b/android/.project
@@ -5,6 +5,12 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
 			<arguments>
@@ -25,9 +31,19 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>org.eclipse.cdt.core.ccnature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
 	</natures>
 </projectDescription>
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index c0c9ef6957..a1094f1218 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -9,6 +9,6 @@ LOCAL_SRC_FILES    = ../../console/griffin/griffin.c ../../console/rzlib/rzlib.c
 
 LOCAL_CFLAGS = -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_VID_CONTEXT -DHAVE_ZLIB -DINLINE=inline -DRARCH_CONSOLE -DLSB_FIRST -D__LIBRETRO__ -DHAVE_CONFIGFILE=1 -DHAVE_GRIFFIN=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -Dmain=rarch_main -std=gnu99
 
-LOCAL_LDLIBS	:= -lGLESv2 -llog
+LOCAL_LDLIBS	:= -L$(SYSROOT)/usr/lib -lGLESv2 -llog
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/android/src/com/retroarch/main.java b/android/src/com/retroarch/main.java
index 74b3199b04..c380f87720 100644
--- a/android/src/com/retroarch/main.java
+++ b/android/src/com/retroarch/main.java
@@ -17,6 +17,11 @@ import android.os.Bundle;
 
 public class main extends Activity
 {
+	static
+	{
+		System.loadLibrary("retroarch");
+	}
+	
 	private GLSurfaceView ctx_gl;
 	
     @Override