diff --git a/packages/torsocks/05_deadlock_in_initializer.patch b/packages/torsocks/05_deadlock_in_initializer.patch
index 66bd593cb2..09c7967e6b 100644
--- a/packages/torsocks/05_deadlock_in_initializer.patch
+++ b/packages/torsocks/05_deadlock_in_initializer.patch
@@ -62,3 +62,13 @@ index 16f2da0..8087ed8 100644
  /*
   * Initialize torsocks library.
   */
+--- a/src/lib/torsocks.h
++++ b/src/lib/torsocks.h
+@@ -452,6 +452,7 @@
+ int tsocks_tor_resolve(int af, const char *hostname, void *ip_addr);
+ int tsocks_tor_resolve_ptr(const char *addr, char **ip, int af);
+ void tsocks_initialize(void);
++void tsocks_initialize_libc_symbols(void);
+ void tsocks_cleanup(void);
+ 
+ #endif /* TORSOCKS_H */
diff --git a/packages/torsocks/build.sh b/packages/torsocks/build.sh
index 2ca6bc8d82..dc650886bd 100644
--- a/packages/torsocks/build.sh
+++ b/packages/torsocks/build.sh
@@ -6,7 +6,6 @@ TERMUX_PKG_VERSION=2.4.0
 TERMUX_PKG_SRCURL=https://gitlab.torproject.org/tpo/core/torsocks/-/archive/v${TERMUX_PKG_VERSION}/torsocks-v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=c01b471d89eda9f3c8dcb85a448e8066692d0707f9ff8b2ac7e665a602291b87
 TERMUX_PKG_DEPENDS="tor"
-TERMUX_PKG_ENABLE_CLANG16_PORTING=false
 
 termux_step_pre_configure() {
 	./autogen.sh
diff --git a/packages/torsocks/torsocks-2.4.0-clang16.patch b/packages/torsocks/torsocks-2.4.0-clang16.patch
new file mode 100644
index 0000000000..895e825bcd
--- /dev/null
+++ b/packages/torsocks/torsocks-2.4.0-clang16.patch
@@ -0,0 +1,16 @@
+https://github.com/termux/termux-packages/issues/15852
+Borrowed from https://github.com/gentoo/gentoo/blob/76fd32c61c0f1872af30e1d02368d1291021d770/net-proxy/torsocks/files/torsocks-2.4.0-clang16.patch
+
+https://bugs.gentoo.org/881077
+https://gitlab.torproject.org/tpo/core/torsocks/-/issues/40014
+https://lists.torproject.org/pipermail/tor-dev/2022-December/014790.html
+--- a/src/common/config-file.h
++++ b/src/common/config-file.h
+@@ -109,6 +109,7 @@ int conf_file_set_allow_inbound(const char *val, struct configuration *config);
+ int conf_file_set_allow_outbound_localhost(const char *val, struct
+ 		configuration *config);
+ int conf_file_set_isolate_pid(const char *val, struct configuration *config);
++int conf_file_set_enable_ipv6(const char *val, struct configuration *config);
+ 
+ int conf_apply_socks_auth(struct configuration *config);
+