diff --git a/android/external/arm64-v8a/Makefile b/android/external/arm64-v8a/Makefile
index 74cc591..c901a7d 100644
--- a/android/external/arm64-v8a/Makefile
+++ b/android/external/arm64-v8a/Makefile
@@ -13,8 +13,6 @@ include ../Makefile.conf
 #------------------------------------------------------------------------------#
 # Build parameters
 
-# TODO: get params from the outside for multiarch build
-
 APP_ABI ?= arm64-v8a
 ANDROID_API ?= 21
 
@@ -92,11 +90,6 @@ showsetup:
 #------------------------------------------------------------------------------#
 # libiconv
 
-# libiconv from git can't autogen with today's debian packages.
-#EXTERNAL_GIT_REPOS += libiconv|git://git.savannah.gnu.org/libiconv.git?5365cc8
-
-# using released package instead
-
 libiconv.src.stamp: ../libiconv-1.15.tar.gz
 	tar xvfz ../libiconv-1.15.tar.gz
 	mv libiconv-1.15 libiconv
@@ -146,14 +139,8 @@ libetpan-cleanzip:
 #------------------------------------------------------------------------------#
 # uuid
 
-# using released package from debian. official ftp wasn't available today
-ossp-uuid_1.6.2.orig.tar.gz:
-	wget http://http.debian.net/debian/pool/main/o/ossp-uuid/ossp-uuid_1.6.2.orig.tar.gz
-	md5sum -c ../ossp-uuid_1.6.2.orig.tar.gz.md5
-	touch $@
-
 uuid.src.stamp: ossp-uuid_1.6.2.orig.tar.gz
-	tar xvfz ossp-uuid_1.6.2.orig.tar.gz
+	tar xvfz ../ossp-uuid_1.6.2.orig.tar.gz
 	mv uuid-1.6.2 uuid
 	touch $@
 
diff --git a/android/external/armeabi-v7a/Makefile b/android/external/armeabi-v7a/Makefile
index 1572b32..28d4c62 100644
--- a/android/external/armeabi-v7a/Makefile
+++ b/android/external/armeabi-v7a/Makefile
@@ -13,8 +13,6 @@ include ../Makefile.conf
 #------------------------------------------------------------------------------#
 # Build parameters
 
-# TODO: get params from the outside for multiarch build
-
 APP_ABI ?= armeabi-v7a
 ANDROID_API ?= 18
 
@@ -92,10 +90,6 @@ showsetup:
 #------------------------------------------------------------------------------#
 # libiconv
 
-# libiconv from git can't autogen with today's debian packages.
-#EXTERNAL_GIT_REPOS += libiconv|git://git.savannah.gnu.org/libiconv.git?5365cc8
-
-# using released package instead
 libiconv-1.15.tar.gz:
 	wget https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.15.tar.gz
 	touch $@
@@ -150,13 +144,9 @@ libetpan-cleanzip:
 # uuid
 
 # using released package from debian. official ftp wasn't available today
-ossp-uuid_1.6.2.orig.tar.gz:
-	wget http://http.debian.net/debian/pool/main/o/ossp-uuid/ossp-uuid_1.6.2.orig.tar.gz
-	md5sum -c ../ossp-uuid_1.6.2.orig.tar.gz.md5
-	touch $@
 
 uuid.src.stamp: ossp-uuid_1.6.2.orig.tar.gz
-	tar xvfz ossp-uuid_1.6.2.orig.tar.gz
+	tar xvfz ../ossp-uuid_1.6.2.orig.tar.gz
 	mv uuid-1.6.2 uuid
 	touch $@
 
diff --git a/android/external/common/Makefile b/android/external/common/Makefile
index fd9e7d3..3a29c63 100644
--- a/android/external/common/Makefile
+++ b/android/external/common/Makefile
@@ -13,16 +13,22 @@ include ../Makefile.conf
 #------------------------------------------------------------------------------#
 # Build parameters
 
-all:  download-iconv #download-uuid build-etpan download sequoia
+all:  download-iconv download-uuid #build-etpan download sequoia
 
 download-iconv: ../libiconv-1.15.tar.gz
 
+download-uuid: ../ossp-uuid_1.6.2.orig.tar.gz
 
 # Download source and patch it
 ../libiconv-1.15.tar.gz:
 	wget https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.15.tar.gz -P ../
 
+../ossp-uuid_1.6.2.orig.tar.gz:
+	wget http://http.debian.net/debian/pool/main/o/ossp-uuid/ossp-uuid_1.6.2.orig.tar.gz -P ../
+	cd .. && md5sum -c ossp-uuid_1.6.2.orig.tar.gz.md5
+
 clean:
 	rm -rf ../libiconv-1.15.tar.gz
+	rm -rf ../ossp-uuid_1.6.2.orig.tar.gz
 
-.PHONY: clean download-iconv
\ No newline at end of file
+.PHONY: clean download-iconv download-uuid
\ No newline at end of file