diff --git a/android/build.gradle b/android/build.gradle
index b3b14a2..5e96eec 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -6,12 +6,12 @@ def pEpEngineSrc = hasProperty('pEpEngineSrc') ? pEpEngineSrc : "../../pEpEngine
 def buildAutomatic = hasProperty('buildAutomatic') ? buildAutomatic : "true"
 def pEpAppPackageName = hasProperty('pEpAppPackageName') ? pEpAppPackageName : "com.pep.k9"
 
-def pEpEngineAndroid = new File(new File(pEpEngineSrc), 'build-android')
-def pEpEngineDB = new File(new File(pEpEngineSrc), 'db')
-def libetpanAndroid = new File(new File(pEpEngineSrc), '../libetpan/build-android')
-
 def externalInstallDir = file('external/data/data/' + pEpAppPackageName + '/app_opt')
 def externalIncludePath = new File(externalInstallDir, 'include').absolutePath
+def libetpanAndroid = file('external/libetpan/build-android')
+
+def pEpEngineAndroid = new File(new File(pEpEngineSrc), 'build-android')
+def pEpEngineDB = new File(new File(pEpEngineSrc), 'db')
 
 buildscript {
     repositories {
diff --git a/android/external/Makefile b/android/external/Makefile
index 9beeb0e..bbf78aa 100644
--- a/android/external/Makefile
+++ b/android/external/Makefile
@@ -20,6 +20,7 @@ PEP_PACKAGE_NAME ?= com.pep.pepjniaaractivity
 # slected commit is archived in external/$project
 
 EXTERNAL_GIT_REPOS = \
+libetpan|https://github.com/fdik/libetpan.git?HEAD\
 gnupg|git://git.gnupg.org/gnupg.git?08c00cd\
 libassuan|git://git.gnupg.org/libassuan.git?261498d\
 libgcrypt|git://git.gnupg.org/libgcrypt.git?b3936b6\
@@ -150,7 +151,7 @@ export AUTOMAKE=automake-1.11
     $(EXTERNAL_LOCAL_GITS_UPDATE) $(EXTERNAL_SRCS_CLEAN) \
 	showsetup
 
-all: gnupg-install gpgme-install assets
+all: libetpan-build gnupg-install gpgme-install assets
 
 
 #------------------------------------------------------------------------------#
@@ -475,6 +476,14 @@ gpgme-clean:
 	-$(MAKE) -C gpgme clean
 	-rm -f gpgme/Makefile gpgme/configure
 
+#------------------------------------------------------------------------------#
+# libetpan
+
+libetpan/libetpan-android-1.zip: libetpan
+	cd libetpan/build-android; ./build.sh
+
+libetpan-build: libetpan/libetpan-android-1.zip
+
 #------------------------------------------------------------------------------#
 # assets for Android app