diff --git a/android/Makefile b/android/Makefile
index 79a216b..1dfc5d9 100644
--- a/android/Makefile
+++ b/android/Makefile
@@ -23,13 +23,18 @@
 # perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
 #
 
-JAVAH=javah
-JAVAC=javac
+JAVA_HOME=/usr/java/jdk1.7.0_05
+JAVAH=$(JAVA_HOME)/bin/javah
+JAVAC=$(JAVA_HOME)/bin/javac
+ANT=/usr/bin/ant
+
+ANDROIDSDK=/opt/android-sdk
+
 NDKBUILD=/opt/android-ndk-r8/ndk-build
 CLASSPATH=br/com/bb/pw3270
-ANDROIDSDK=/opt/android-sdk
 MKDIR=/bin/mkdir -p
 CONVERT=rsvg-convert
+JAVASRCDIR=src/br/com/bb/pw3270
 
 RESOLUTION=xhdpi mdpi ldpi hdpi
 
@@ -62,16 +67,19 @@ res/drawable-hdpi/%.png: %.svg
 
 #---[ Targets ]----------------------------------------------------------------
 
-all: jni/lib3270jni.h icons
-	@$(NDKBUILD)
+Debug: bin/pw3270-debug.apk
+
+bin/pw3270-debug.apk: icons libs/armeabi/lib3270.so $(JAVASRCDIR)/*.java
+	$(ANT) debug
 
-Debug: jni/lib3270jni.h icons
+
+libs/armeabi/lib3270.so: jni/lib3270jni.h jni/*.cpp
 	@$(NDKBUILD)
 
 icons: $(foreach DIR, $(RESOLUTION), res/drawable-$(DIR)/ic_launcher.png) \
 	$(foreach DIR, $(RESOLUTION), res/drawable-$(DIR)/ic_connect.png) \
 	$(foreach DIR, $(RESOLUTION), res/drawable-$(DIR)/ic_disconnect.png) \
-	$(foreach DIR, $(RESOLUTION), res/drawable-$(DIR)/ic_settings.png) 
+	$(foreach DIR, $(RESOLUTION), res/drawable-$(DIR)/ic_settings.png)
 
 clean:
 	@rm -fr obj
@@ -108,4 +116,3 @@ sigs.txt: bin/classes/$(CLASSPATH)/lib3270.class
 jni/lib3270jni.h: bin/classes/$(CLASSPATH)/lib3270.class
 	@echo "  GEN  `basename $@`"
 	@$(JAVAH) -o $@ -classpath $(ANDROIDSDK)/platforms/android-15/android.jar:bin/classes $(subst /,.,$(CLASSPATH)).lib3270
-
diff --git a/android/build.xml b/android/build.xml
new file mode 100644
index 0000000..9c1a07c
--- /dev/null
+++ b/android/build.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="pw3270" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="ant.properties" />
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through an env var"
+            unless="sdk.dir"
+    />
+
+    <!--
+        Import per project custom build rules if present at the root of the project.
+        This is the place to put custom intermediary targets such as:
+            -pre-build
+            -pre-compile
+            -post-compile (This is typically used for code obfuscation.
+                           Compiled code location: ${out.classes.absolute.dir}
+                           If this is not done in place, override ${out.dex.input.absolute.dir})
+            -post-package
+            -post-build
+            -pre-clean
+    -->
+    <import file="custom_rules.xml" optional="true" />
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>
diff --git a/android/local.properties b/android/local.properties
new file mode 100644
index 0000000..12a0114
--- /dev/null
+++ b/android/local.properties
@@ -0,0 +1,10 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+
+# location of the SDK. This is only used by Ant
+# For customization when using a Version Control System, please read the
+# header note.
+sdk.dir=/opt/android-sdk
--
libgit2 0.21.2