diff --git a/android/external/arm64-v8a/Makefile b/android/external/arm64-v8a/Makefile
index dc6954a..dd256f8 100644
--- a/android/external/arm64-v8a/Makefile
+++ b/android/external/arm64-v8a/Makefile
@@ -130,7 +130,7 @@ libetpan-clean:
 #------------------------------------------------------------------------------#
 # uuid
 
-uuid.src.stamp: ../downloads/ossp-uuid_1.6.2.orig.tar.gz
+uuid.src.stamp: ../downloads/ossp-uuid_1.6.2.orig-patched.tar.gz
 	tar xvf $<
 	mv uuid-1.6.2 uuid
 	touch $@
@@ -144,7 +144,6 @@ uuid-clean:
 uuid/Makefile: uuid.src.stamp
 	$(SED) -i 's,AC_CHECK_VA_COPY(),,' uuid/uuid.ac
 	cd uuid && autoconf
-	-patch -N -p1 --reject-file=- uuid/libtool.m4 ../libtool-Add-Android-Linux-support-iconv.patch
 	cp ../config.sub uuid
 	cp ../config.guess uuid
 	cd uuid && \
diff --git a/android/external/armeabi-v7a/Makefile b/android/external/armeabi-v7a/Makefile
index 7eb8edf..6a0a594 100644
--- a/android/external/armeabi-v7a/Makefile
+++ b/android/external/armeabi-v7a/Makefile
@@ -137,7 +137,7 @@ libetpan-clean:
 
 # using released package from debian. official ftp wasn't available today
 
-uuid.src.stamp: ../downloads/ossp-uuid_1.6.2.orig.tar.gz
+uuid.src.stamp: ../downloads/ossp-uuid_1.6.2.orig-patched.tar.gz
 	tar xvf $<
 	mv uuid-1.6.2 uuid
 	touch $@
@@ -151,7 +151,6 @@ uuid-clean:
 uuid/Makefile: uuid.src.stamp
 	$(SED) -i 's,AC_CHECK_VA_COPY(),,' uuid/uuid.ac
 	cd uuid && autoconf
-	-patch -N -p1 --reject-file=- uuid/libtool.m4 ../libtool-Add-Android-Linux-support-iconv.patch
 	cp ../config.sub uuid
 	cp ../config.guess uuid
 	cd uuid && \
diff --git a/android/external/downloads/Makefile b/android/external/downloads/Makefile
index f2b0eff..4d66ce3 100644
--- a/android/external/downloads/Makefile
+++ b/android/external/downloads/Makefile
@@ -20,7 +20,7 @@ downloads.stamp: download-iconv download-uuid download-sequoia-deps download-etp
 
 download-iconv: libiconv-1.15.tar.gz
 
-download-uuid: ossp-uuid_1.6.2.orig.tar.gz
+download-uuid: ossp-uuid_1.6.2.orig-patched.tar.gz
 
 download-sequoia-deps: openssl-$(OPENSSL_VERSION).tar.gz gmp-$(GMP_VERSION).tar.bz2 \
 						nettle-$(NETTLE_VERSION)-patched.tar.gz
@@ -33,6 +33,11 @@ download-sequoia: sequoia.git.stamp
 libiconv-1.15.tar.gz:
 	wget https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.15.tar.gz
 
+ossp-uuid_1.6.2.orig-patched.tar.gz: ossp-uuid_1.6.2.orig.tar.gz
+	tar -xvf $<
+	-patch -N -p1 --reject-file=- uuid-1.6.2/libtool.m4 ../libtool-Add-Android-Linux-support-iconv.patch
+	tar -czvf $@ uuid-1.6.2
+
 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
diff --git a/android/external/x86/Makefile b/android/external/x86/Makefile
index bf42d88..3b96355 100644
--- a/android/external/x86/Makefile
+++ b/android/external/x86/Makefile
@@ -132,7 +132,7 @@ libetpan-clean:
 #------------------------------------------------------------------------------#
 # uuid
 
-uuid.src.stamp: ../downloads/ossp-uuid_1.6.2.orig.tar.gz
+uuid.src.stamp: ../downloads/ossp-uuid_1.6.2.orig-patched.tar.gz
 	tar xvf $<
 	mv uuid-1.6.2 uuid
 	touch $@
@@ -146,7 +146,6 @@ uuid-clean:
 uuid/Makefile: uuid.src.stamp
 	$(SED) -i 's,AC_CHECK_VA_COPY(),,' uuid/uuid.ac
 	cd uuid && autoconf
-	-patch -N -p1 --reject-file=- uuid/libtool.m4 ../libtool-Add-Android-Linux-support-iconv.patch
 	cp ../config.sub uuid
 	cp ../config.guess uuid
 	cd uuid && \
diff --git a/android/external/x86_64/Makefile b/android/external/x86_64/Makefile
index 40bfcdb..1399e84 100644
--- a/android/external/x86_64/Makefile
+++ b/android/external/x86_64/Makefile
@@ -132,7 +132,7 @@ libetpan-clean:
 #------------------------------------------------------------------------------#
 # uuid
 
-uuid.src.stamp: ../downloads/ossp-uuid_1.6.2.orig.tar.gz
+uuid.src.stamp: ../downloads/ossp-uuid_1.6.2.orig-patched.tar.gz
 	tar xvf $<
 	mv uuid-1.6.2 uuid
 	touch $@
@@ -146,7 +146,6 @@ uuid-clean:
 uuid/Makefile: uuid.src.stamp
 	$(SED) -i 's,AC_CHECK_VA_COPY(),,' uuid/uuid.ac
 	cd uuid && autoconf
-	-patch -N -p1 --reject-file=- uuid/libtool.m4 ../libtool-Add-Android-Linux-support-iconv.patch
 	cp ../config.sub uuid
 	cp ../config.guess uuid
 	cd uuid && \