diff --git a/android/.project b/android/.project
new file mode 100644
index 0000000..6102a05
--- /dev/null
+++ b/android/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>pw3270</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/android/.settings/org.eclipse.jdt.core.prefs b/android/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..f77b31c
--- /dev/null
+++ b/android/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/android/Makefile b/android/Makefile
index 7cd9cf0..a1e2937 100644
--- a/android/Makefile
+++ b/android/Makefile
@@ -28,9 +28,9 @@
 # http://developer.android.com/tools/building/building-cmdline.html
 #
 
-JAVA_HOME=/usr/java/jdk1.7.0_05
-JAVAH=$(JAVA_HOME)/bin/javah
-JAVAC=$(JAVA_HOME)/bin/javac
+JDK_HOME=/usr/java/jdk1.7.0_05
+JAVAH=$(JDK_HOME)/bin/javah
+JAVAC=$(JDK_HOME)/bin/javac
 ANT=/usr/bin/ant
 
 ANDROIDSDK=/opt/android-sdk
@@ -78,10 +78,10 @@ all: pw3270-release-unsigned.apk
 Debug: bin/pw3270-debug.apk
 
 bin/pw3270-debug.apk: icons libs/armeabi/lib3270.so $(JAVASRCDIR)/*.java
-	$(ANT) debug
+	@JAVA_HOME=$(JDK_HOME) $(ANT) debug
 
 pw3270-release-unsigned.apk: icons libs/armeabi/lib3270.so $(JAVASRCDIR)/*.java
-	$(ANT) release
+	@JAVA_HOME=$(JDK_HOME) $(ANT) release
 
 libs/armeabi/lib3270.so: jni/lib3270jni.h jni/*.cpp
 	@$(NDKBUILD)
@@ -92,10 +92,10 @@ icons: $(foreach DIR, $(RESOLUTION), res/drawable-$(DIR)/ic_launcher.png) \
 	$(foreach DIR, $(RESOLUTION), res/drawable-$(DIR)/ic_settings.png)
 
 clean:
+	@rm -fr bin
 	@rm -fr obj
 	@rm -f jni/lib3270jni.h
 	@rm -f sigs.txt
-	@rm -f bin/classes/$(CLASSPATH)/lib3270.class
 	@rm -f $(foreach DIR, $(RESOLUTION), res/drawable-$(DIR)/*.png)
 
 cleanDebug: clean
--
libgit2 0.21.2