diff --git a/packages/fossil/autosetup-cc.tcl.patch b/packages/fossil/autosetup-cc.tcl.patch
new file mode 100644
index 000000000..4e9ff4eb4
--- /dev/null
+++ b/packages/fossil/autosetup-cc.tcl.patch
@@ -0,0 +1,29 @@
+--- ./autosetup/cc.tcl	2021-07-02 18:16:01.000000000 +0530
++++ ./autosetup/cc.tcl.mod	2021-08-03 07:04:16.933978205 +0530
+@@ -109,25 +109,7 @@
+ #
+ # Checks that the given include files can be used.
+ proc cc-check-includes {args} {
+-	cc-check-some-feature $args {
+-		set with {}
+-		if {[dict exists $::autosetup(cc-include-deps) $each]} {
+-			set deps [dict keys [dict get $::autosetup(cc-include-deps) $each]]
+-			msg-quiet cc-check-includes {*}$deps
+-			foreach i $deps {
+-				if {[have-feature $i]} {
+-					lappend with $i
+-				}
+-			}
+-		}
+-		if {[llength $with]} {
+-			cc-with [list -includes $with] {
+-				cctest -includes $each
+-			}
+-		} else {
+-			cctest -includes $each
+-		}
+-	}
++	return 1
+ }
+ 
+ # @cc-include-needs include required ...
diff --git a/packages/fossil/build.sh b/packages/fossil/build.sh
index 8b522c5f7..61e57d11a 100644
--- a/packages/fossil/build.sh
+++ b/packages/fossil/build.sh
@@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="DSCM with built-in wiki, http interface and server, tick
 TERMUX_PKG_LICENSE="BSD 2-Clause"
 TERMUX_PKG_LICENSE_FILE="COPYRIGHT-BSD2.txt"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=2.15.1
-TERMUX_PKG_SRCURL=https://www.fossil-scm.org/index.html/uv/fossil-src-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=80d27923c663b2a2c710f8ae8cd549862e04f8c04285706274c34ae3c8ca17d1
+TERMUX_PKG_VERSION=2.16
+TERMUX_PKG_SRCURL=https://fossil-scm.org/home/tarball/7aedd5675883d4412cf20917d340b6985e3ecb842e88a39f135df034b2d5f4d3/fossil-src-2.16.tar.gz
+TERMUX_PKG_SHA256=fab37e8093932b06b586e99a792bf9b20d00d530764b5bddb1d9a63c8cdafa14
 TERMUX_PKG_DEPENDS="libsqlite, openssl, zlib"
 
 termux_step_pre_configure() {
diff --git a/packages/fossil/src-main.c.patch b/packages/fossil/src-main.c.patch
new file mode 100644
index 000000000..b1bc44e9d
--- /dev/null
+++ b/packages/fossil/src-main.c.patch
@@ -0,0 +1,16 @@
+--- ./src/main.c	2021-07-02 18:16:01.000000000 +0530
++++ ./src/main.c.mod	2021-08-03 07:01:36.763978266 +0530
+@@ -351,11 +351,11 @@
+   */
+   db_unsave_encryption_key();
+ #endif
+-#if defined(_WIN32) || (defined(__BIONIC__) && !defined(FOSSIL_HAVE_GETPASS))
++#if defined(__ANDROID__)
+   /*
+   ** Free the secure getpass() buffer now.
+   */
+-  freepass();
++  fossil_freepass();
+ #endif
+ #if defined(_WIN32) && !defined(_WIN64) && defined(FOSSIL_ENABLE_TCL) && \
+     defined(USE_TCL_STUBS)
diff --git a/packages/fossil/src-user.c.patch b/packages/fossil/src-user.c.patch
new file mode 100644
index 000000000..66db3c22c
--- /dev/null
+++ b/packages/fossil/src-user.c.patch
@@ -0,0 +1,35 @@
+--- ./src/user.c	2021-08-02 21:07:17.266953016 +0530
++++ ./src/user.c.mod	2021-08-03 06:59:51.313978307 +0530
+@@ -51,7 +51,7 @@
+ static char *zPwdBuffer = 0;
+ static size_t nPwdBuffer = 0;
+ 
+-static char *getpass(const char *prompt){
++static char *fossil_getpass(const char *prompt){
+   char *zPwd;
+   size_t nPwd;
+   size_t i;
+@@ -107,7 +107,7 @@
+   assert( zPwd==zPwdBuffer );
+   return zPwd;
+ }
+-void freepass(){
++void fossil_freepass(){
+   if( !zPwdBuffer ) return;
+   assert( nPwdBuffer>0 );
+   fossil_secure_free_page(zPwdBuffer, nPwdBuffer);
+@@ -221,12 +221,12 @@
+ #endif
+   if( fossil_security_level()>=2 ){
+     userGenerateScrambleCode();
+-    z = getpass(zPrompt);
++    z = fossil_getpass(zPrompt);
+     if( z ) userDescramble(z);
+     printf("\033[3A\033[J");  /* Erase previous three lines */
+     fflush(stdout);
+   }else{
+-    z = getpass(zPrompt);
++    z = fossil_getpass(zPrompt);
+   }
+   strip_string(pPassphrase, z);
+ }