diff --git a/packages/p7zip/build.sh b/packages/p7zip/build.sh
index e5e2375c2..119a7ab97 100644
--- a/packages/p7zip/build.sh
+++ b/packages/p7zip/build.sh
@@ -1,15 +1,16 @@
-TERMUX_PKG_HOMEPAGE=https://github.com/szcnick/p7zip
+TERMUX_PKG_HOMEPAGE=https://github.com/jinfeihan57/p7zip
 TERMUX_PKG_DESCRIPTION="Command-line version of the 7zip compressed file archiver"
 TERMUX_PKG_LICENSE="LGPL-2.1"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=17.02
-TERMUX_PKG_SRCURL=https://github.com/szcnick/p7zip/archive/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=c22310db467755241104f98943c688c5f2c854394c4aea8eef0d77fe6420228c
-TERMUX_PKG_DEPENDS="libc++"
+TERMUX_PKG_VERSION=17.03
+TERMUX_PKG_SRCURL=https://github.com/jinfeihan57/p7zip/archive/v${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=bb4b9b21584c0e076e0b4b2705af0dbe7ac19d378aa7f09a79da33a5b3293187
+TERMUX_PKG_DEPENDS="libc++, libiconv"
 TERMUX_PKG_BUILD_IN_SRC=true
 
 termux_step_configure() {
-	export CXXFLAGS="$CXXFLAGS -Wno-c++11-narrowing"
+	export CXXFLAGS="$CXXFLAGS $CPPFLAGS -Wno-c++11-narrowing"
+	export LDFLAGS="$LDFLAGS -liconv"
 	cp makefile.android_arm makefile.machine
 }
 
diff --git a/packages/p7zip/no-type-redefinitions.patch b/packages/p7zip/no-type-redefinitions.patch
new file mode 100644
index 000000000..40cb7c937
--- /dev/null
+++ b/packages/p7zip/no-type-redefinitions.patch
@@ -0,0 +1,19 @@
+diff -uNr p7zip-17.03/C/hashes/hash.h p7zip-17.03.mod/C/hashes/hash.h
+--- p7zip-17.03/C/hashes/hash.h	2020-12-28 15:10:01.000000000 +0200
++++ p7zip-17.03.mod/C/hashes/hash.h	2020-12-30 21:09:08.687899022 +0200
+@@ -42,6 +42,7 @@
+ 
+ #include "../7zTypes.h"
+ 
++#ifndef __ANDROID__
+ #ifndef _UINT32_T_DECLARED
+ typedef UInt32 uint32_t;
+ #define _UINT32_T_DECLARED
+@@ -51,6 +52,7 @@
+ typedef UInt64 uint64_t;
+ #define _UINT64_T_DECLARED
+ #endif
++#endif
+ 
+ //#include <stdint.h>
+