diff --git a/ant.properties b/ant.properties
new file mode 100644
index 00000000000..dfedffdf262
--- /dev/null
+++ b/ant.properties
@@ -0,0 +1,18 @@
+# This file is used to override default values used by the Ant build system.
+#
+# This file must be checked in Version Control Systems, as it is
+# integral to the build system of your project.
+
+# This file is only used by the Ant script.
+
+# You can use this to override default values such as
+#  'source.dir' for the location of your java source folder and
+#  'out.dir' for the location of your output folder.
+
+# You can also use it define how the release builds are signed by declaring
+# the following properties:
+#  'key.store' for the location of your keystore and
+#  'key.alias' for the name of the key to use.
+# The password will be asked during the build when you use the 'release' target.
+
+application-package=org.geometerplus.zlibrary.ui.android.library
diff --git a/build.properties b/build.properties
deleted file mode 100644
index 7a3b30da8d5..00000000000
--- a/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# The name of your application package as defined in the manifest.
-# Used by the 'uninstall' rule.
-application-package=org.geometerplus.zlibrary.ui.android.library
diff --git a/build.xml b/build.xml
index 8158f3f8d8d..b28bf2bce08 100644
--- a/build.xml
+++ b/build.xml
@@ -1,22 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="FBReaderJ" default="package">
-	<property file="local.properties" />
-	<property file="build.properties" />
-	<property file="default.properties" />
+<project name="FBReaderJ" default="help">
+  <loadproperties srcFile="local.properties" />
+  <property file="ant.properties" />
+  <loadproperties srcFile="project.properties" />
 
-	<path id="android.antlibs">
-		<pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
-		<pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
-		<pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
-		<pathelement path="${sdk.dir}/tools/lib/apkbuilder.jar" />
-		<pathelement path="${sdk.dir}/tools/lib/jarutils.jar" />
-	</path>
-
-	<taskdef name="setup"
-		classname="com.android.ant.SetupTask"
-		classpathref="android.antlibs" />
-
-	<setup />
+  <!-- quick check on sdk.dir -->
+  <fail
+    message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'"
+    unless="sdk.dir"
+  />
 
 	<target name="init" description="Initialization...">
 		<fail message="Ant 1.7.0 or higher is required. Please upgrade your ant.">
@@ -73,9 +65,15 @@
 		<echo message="DONE (Copying icons files to 'res/drawable/' folder)" />
 	</target>
 
-	<target name="package" depends="init, resources, native, release" />
-	<target name="dbg" depends="init, resources, native, debug" />
+  <target name="-pre-build" depends="init, resources, native">
+  </target>
+<!--
+  <target name="-pre-compile">
+  </target>
 
+  <target name="-post-compile">
+  </target>
+-->
 	<target name="clean">
 		<echo message="Deleting temporary files..." />
 		<delete dir="gen" />
@@ -92,4 +90,6 @@
 		<delete dir="libs/armeabi-v7" />
 		<echo message="DONE (Deleting native libraries)" />
 	</target>
+
+  <import file="${sdk.dir}/tools/ant/build.xml" />
 </project>
diff --git a/default.properties b/project.properties
similarity index 81%
rename from default.properties
rename to project.properties
index 513f21f101b..3aa40afdc8f 100644
--- a/default.properties
+++ b/project.properties
@@ -1,13 +1,13 @@
 # This file is automatically generated by Android Tools.
 # Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-# 
+#
 # This file must be checked in Version Control Systems.
-# 
+#
 # To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
+# "ant.properties", and override values to adapt the script to your
 # project structure.
 
-# Project target.
-target=android-8
 java.encoding=utf-8
 proguard.config=proguard.cfg
+# Project target.
+target=android-8