diff --git a/android/external/arm64-v8a/Makefile b/android/external/arm64-v8a/Makefile
index f44569e..dc6954a 100644
--- a/android/external/arm64-v8a/Makefile
+++ b/android/external/arm64-v8a/Makefile
@@ -256,7 +256,7 @@ gmp-install: $(LOCAL)/lib/libgmp.so
 #------------------------------------------------------------------------------#
 # NETTLE
 
-nettle.src.stamp: ../downloads/nettle-$(NETTLE_VERSION).tar.gz $(LOCAL)/lib/libgmp.so
+nettle.src.stamp: ../downloads/nettle-$(NETTLE_VERSION)-patched.tar.gz $(LOCAL)/lib/libgmp.so
 	tar xvf $<
 	mv nettle-$(NETTLE_VERSION) nettle
 	touch $@
@@ -268,8 +268,6 @@ nettle-clean:
 	rm -rf nettle.src.stamp
 
 nettle/Makefile: nettle.src.stamp
-	-patch -N -p1 --reject-file=- nettle/configure.ac  ../nettle-3.4.1-remove-so-versioning.patch
-	-patch -N -p1 --reject-file=- nettle/Makefile.in  ../nettle-3.4.1-remove-so-versioning-link.patch
 	cd nettle && \
 		CC="$(CC)" LD="$(LD)" AR="$(AR)" AS="$(AS)" RANLIB=$(RANLIB) STRIP="$(STRIP)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
 			./configure \
diff --git a/android/external/armeabi-v7a/Makefile b/android/external/armeabi-v7a/Makefile
index 8c77cca..7eb8edf 100644
--- a/android/external/armeabi-v7a/Makefile
+++ b/android/external/armeabi-v7a/Makefile
@@ -261,7 +261,7 @@ gmp-install: $(LOCAL)/lib/libgmp.so
 #------------------------------------------------------------------------------#
 # NETTLE
 
-nettle.src.stamp: ../downloads/nettle-$(NETTLE_VERSION).tar.gz $(LOCAL)/lib/libgmp.so
+nettle.src.stamp: ../downloads/nettle-$(NETTLE_VERSION)-patched.tar.gz $(LOCAL)/lib/libgmp.so
 	tar xvf $<
 	mv nettle-$(NETTLE_VERSION) nettle
 	touch $@
@@ -273,8 +273,6 @@ nettle-clean:
 	rm -rf nettle.src.stamp
 
 nettle/Makefile: nettle.src.stamp
-	-patch -N -p1 --reject-file=- nettle/configure.ac  ../nettle-3.4.1-remove-so-versioning.patch
-	-patch -N -p1 --reject-file=- nettle/Makefile.in  ../nettle-3.4.1-remove-so-versioning-link.patch
 	cd nettle && \
 		CC="$(CC)" LD="$(LD)" AR="$(AR)" AS="$(AS)" RANLIB=$(RANLIB) STRIP="$(STRIP)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
 			./configure \
diff --git a/android/external/downloads/Makefile b/android/external/downloads/Makefile
index bc8bdd1..f2b0eff 100644
--- a/android/external/downloads/Makefile
+++ b/android/external/downloads/Makefile
@@ -23,7 +23,7 @@ download-iconv: libiconv-1.15.tar.gz
 download-uuid: ossp-uuid_1.6.2.orig.tar.gz
 
 download-sequoia-deps: openssl-$(OPENSSL_VERSION).tar.gz gmp-$(GMP_VERSION).tar.bz2 \
-						nettle-$(NETTLE_VERSION).tar.gz
+						nettle-$(NETTLE_VERSION)-patched.tar.gz
 
 download-etpan: libetpan.git.stamp
 
@@ -45,6 +45,12 @@ gmp-$(GMP_VERSION).tar.bz2:
 	wget -nc https://gmplib.org/download/gmp/gmp-$(GMP_VERSION).tar.bz2
 	md5sum -c gmp-$(GMP_VERSION).tar.bz2.md5
 
+nettle-$(NETTLE_VERSION)-patched.tar.gz: nettle-$(NETTLE_VERSION).tar.gz
+	tar -xvf $<
+	-patch -N -p1 --reject-file=- nettle-$(NETTLE_VERSION)/configure.ac  ../nettle-3.4.1-remove-so-versioning.patch
+	-patch -N -p1 --reject-file=- nettle-$(NETTLE_VERSION)/Makefile.in  ../nettle-3.4.1-remove-so-versioning-link.patch
+	tar -czvf $@ nettle-$(NETTLE_VERSION)
+
 nettle-$(NETTLE_VERSION).tar.gz:
 	wget -nc https://ftp.gnu.org/gnu/nettle/nettle-$(NETTLE_VERSION).tar.gz
 	md5sum -c nettle-$(NETTLE_VERSION).tar.gz.md5
diff --git a/android/external/x86/Makefile b/android/external/x86/Makefile
index ff3899e..bf42d88 100644
--- a/android/external/x86/Makefile
+++ b/android/external/x86/Makefile
@@ -257,7 +257,7 @@ gmp-install: $(LOCAL)/lib/libgmp.so
 #------------------------------------------------------------------------------#
 # NETTLE
 
-nettle.src.stamp: ../downloads/nettle-$(NETTLE_VERSION).tar.gz $(LOCAL)/lib/libgmp.so
+nettle.src.stamp: ../downloads/nettle-$(NETTLE_VERSION)-patched.tar.gz $(LOCAL)/lib/libgmp.so
 	tar xvf $<
 	mv nettle-$(NETTLE_VERSION) nettle
 	touch $@
@@ -269,8 +269,6 @@ nettle-clean:
 	rm -rf nettle.src.stamp
 
 nettle/Makefile: nettle.src.stamp
-	-patch -N -p1 --reject-file=- nettle/configure.ac  ../nettle-3.4.1-remove-so-versioning.patch
-	-patch -N -p1 --reject-file=- nettle/Makefile.in  ../nettle-3.4.1-remove-so-versioning-link.patch
 	cd nettle && \
 		CC="$(CC)" LD="$(LD)" AR="$(AR)" AS="$(AS)" RANLIB=$(RANLIB) STRIP="$(STRIP)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
 			./configure \
diff --git a/android/external/x86_64/Makefile b/android/external/x86_64/Makefile
index d99e3d6..40bfcdb 100644
--- a/android/external/x86_64/Makefile
+++ b/android/external/x86_64/Makefile
@@ -257,7 +257,7 @@ gmp-install: $(LOCAL)/lib/libgmp.so
 #------------------------------------------------------------------------------#
 # NETTLE
 
-nettle.src.stamp: ../downloads/nettle-$(NETTLE_VERSION).tar.gz $(LOCAL)/lib/libgmp.so
+nettle.src.stamp: ../downloads/nettle-$(NETTLE_VERSION)-patched.tar.gz $(LOCAL)/lib/libgmp.so
 	tar xvf $<
 	mv nettle-$(NETTLE_VERSION) nettle
 	touch $@
@@ -269,8 +269,6 @@ nettle-clean:
 	rm -rf nettle.src.stamp
 
 nettle/Makefile: nettle.src.stamp
-	-patch -N -p1 --reject-file=- nettle/configure.ac  ../nettle-3.4.1-remove-so-versioning.patch
-	-patch -N -p1 --reject-file=- nettle/Makefile.in  ../nettle-3.4.1-remove-so-versioning-link.patch
 	cd nettle && \
 		CC="$(CC)" LD="$(LD)" AR="$(AR)" AS="$(AS)" RANLIB=$(RANLIB) STRIP="$(STRIP)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
 			./configure \