diff --git a/Makefile b/Makefile
index 18e8f8372af76c6048eaf16dcd1a9d0ed0fa92fd..5f63a9bfe08d0fa3c3e60dd0b65d295fdb7a419d 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ export SFLPHONE_SRC=$(PWD)/sflphone
 LIBSFLPHONEJNI_H=sflphone/daemon/src/sflphone.h
 LIBSFLPHONEJNI=$(SRC)/obj/local/$(ARCH)/libsflphone.so
 
-JAVA_SOURCES=$(SRC)/src/org/sflphone/*.java
+JAVA_SOURCES=$(shell find $(SRC)/src/org/sflphone/ -type f -name "*.java")
 JNI_SOURCES=$(SRC)/jni/*.cpp $(SRC)/jni/*.h
 
 ifneq ($(V),)
@@ -38,7 +38,6 @@ $(SFLPHONE_APK): $(LIBSFLPHONEJNI) $(JAVA_SOURCES)
 	date +"%Y-%m-%d" > $(SRC)/assets/builddate.txt
 	echo `id -u -n`@`hostname` > $(SRC)/assets/builder.txt
 	git rev-parse --short HEAD > $(SRC)/assets/revision.txt
-	./gen-env.sh $(SRC)
 	$(VERBOSE)cd $(SRC) && ant $(ANT_OPTS) $(ANT_TARGET)
 
 $(LIBSFLPHONEJNI): $(JNI_SOURCES) $(LIBSFLPHONEJNI_H)
diff --git a/sflphone-android/assets/builddate.txt b/sflphone-android/assets/builddate.txt
new file mode 100644
index 0000000000000000000000000000000000000000..3d089304e8f9a33acb7844dcd9cf1465f0c19eca
--- /dev/null
+++ b/sflphone-android/assets/builddate.txt
@@ -0,0 +1 @@
+2014-08-07
diff --git a/sflphone-android/assets/builder.txt b/sflphone-android/assets/builder.txt
new file mode 100644
index 0000000000000000000000000000000000000000..535020477a30f7c96621263f9415a8811ad05260
--- /dev/null
+++ b/sflphone-android/assets/builder.txt
@@ -0,0 +1 @@
+tmatth@bodega
diff --git a/sflphone-android/assets/revision.txt b/sflphone-android/assets/revision.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d2cebd00ce3b8b25a6fffa5f8187cf197118de75
--- /dev/null
+++ b/sflphone-android/assets/revision.txt
@@ -0,0 +1 @@
+719259d
diff --git a/sflphone-android/project.properties b/sflphone-android/project.properties
index a3ee5ab64f5e1901414e83e26717725e035b2aae..4ab125693c7c484a0252ee7eca9616e0f9b1ac67 100644
--- a/sflphone-android/project.properties
+++ b/sflphone-android/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-17
+target=android-19