diff --git a/dev-libs/tntnet/Manifest b/dev-libs/tntnet/Manifest
index e137c60903859c54e184c003c88368733ddbca1a..27e745879ed183674727c6c715472fc77d0d9802 100644
--- a/dev-libs/tntnet/Manifest
+++ b/dev-libs/tntnet/Manifest
@@ -1,3 +1,4 @@
+AUX tntnet-2.0-zlib-minizip.patch 1432 SHA256 5ce9dca08f393da15eca1187133d1430b2b7594000891a13fdb31f9c8a88263a SHA512 13909d58fa2ea73c074816498faaa94dadc3fb750179b8f290600eb8a1adaf6a45464d0ee412ea9d038ab5e524a13da0e44fb07424388f28f16df538845dda07 WHIRLPOOL 619e31db6618a911cbb1c5455d448702c64e1e531545cd2292fbcf055f58e055940fca4fe4d81782309d158e8abeff79c36a4c66ee50d5f44a498a14c80f513f
 AUX tntnet.initd 675 SHA256 66c3112cdba91443b73c92087f12c480db7d3f6f85e8b886df3d26decf7caa73 SHA512 2420a89d47ff59fccc9a92b4cc6ec53391168d05da9df4cfb184c7f5eee45ae244ac6258ee3724b2307cfa524c58cb21884619bf74010098a072253303918add WHIRLPOOL 911dba291d070252a045f7821433a38ffc2542ec0cc66af53d5761e9a6b521fa081b6a91b1ed5976ca8dd33ce36543cf7343538c738474e9fb676e5e21a85188
 DIST tntnet-2.3rc1.tar.gz 777781 SHA256 219e7de0f887d4d6bdc8682f0ec9734348f2187a64aa4a232892c76cc19d2c2b SHA512 38d68ac68dd2e7e64f67331792d629a8cfe11ed80ce4ef4ab4c8fcaa36069fa2ede0c1ca72a37ed3aa3c8f096a9a28c48ef3843556dcdc68cd9c67e7718ffca0 WHIRLPOOL 46c2a96d5e510ad5349f7d7399f38f6b6a75321146d273d0aab24fbdc5deba9c9067fab87c55515a7b82141bce1a3ffdda7a438b17e3c9cff8b54d81ff9afaf3
-EBUILD tntnet-2.3_rc1.ebuild 1766 SHA256 8ccb8ab48eb068af714239fba117c46d024e13ddef76da79c5d37bd0cc15732d SHA512 dfa1cf669a693605ec787615f50d6facb666bb3393b2d2250909f6e33af9b82837678f3c1ab1ab171c161e2bd9d874c2745a95168423b918cee0e3fe027ff3b8 WHIRLPOOL ee791185ff9481f0716cf38206c2fec810a125fa38b4a88f9cc062c75d2862df16ff69f1100684dc66f0ec10ad40d64f028125d8ff766773f022c2f570d3a1ea
+EBUILD tntnet-2.3_rc1.ebuild 1899 SHA256 dd0bc4552f566f14376a79a940b4acc03769d1a6ddc1a7a7d0b23f955f3af224 SHA512 643c6064372e739c74420ed64b175f930be03a7a3ca52aa2121b27f603e4cf6cd9cfa4ecbb18bb28654b3b158dad134c5986a94b7a18d060f7cddd8afb34571b WHIRLPOOL 424c0f0d7ac4b48031dcb4bc6ad93742012e16d4cf1baa9cd5510e185a3a6c2f6cdbfb03d7b48da7cf6d068331a63d56d62f3900fc3c4e1d0966cd006fcb7bbf
diff --git a/dev-libs/tntnet/files/tntnet-2.0-zlib-minizip.patch b/dev-libs/tntnet/files/tntnet-2.0-zlib-minizip.patch
new file mode 100644
index 0000000000000000000000000000000000000000..07b4836319d4ed32b47cf2d14a13e1c6a6a8cd90
--- /dev/null
+++ b/dev-libs/tntnet/files/tntnet-2.0-zlib-minizip.patch
@@ -0,0 +1,65 @@
+--- a/configure.in
++++ b/configure.in
+@@ -18,6 +18,7 @@
+ 
+ AC_PROG_CXX
+ AC_PROG_LIBTOOL
++PKG_PROG_PKG_CONFIG
+ 
+ AC_LANG(C++)
+ ACX_PTHREAD
+@@ -25,6 +26,12 @@
+ AC_CHECK_HEADER([zlib.h], , AC_MSG_ERROR([zlib not found]))
+ AC_CHECK_HEADER([cxxtools/net/tcpsocket.h], , AC_MSG_ERROR([cxxtools headers not found]))
+ 
++PKG_CHECK_MODULES([MINIZIP], [minizip],
++  [HAVE_MINIZIP=true], [HAVE_MINIZIP=false])
++AC_SUBST([MINIZIP_CFLAGS])
++AC_SUBST([MINIZIP_LIBS])
++AM_CONDITIONAL([HAVE_MINIZIP], [test $HAVE_MINIZIP = true])
++
+ AC_ARG_WITH([epoll],
+   AS_HELP_STRING([--with-epoll=yes|no|probe], [use epoll]),
+   [epoll_option=$withval],
+--- a/framework/common/Makefile.am
++++ b/framework/common/Makefile.am
+@@ -23,7 +23,6 @@ libtntnet_la_SOURCES = \
+ 	httpparser.cpp \
+ 	httprequest.cpp \
+ 	httpreply.cpp \
+-	ioapi.c \
+ 	job.cpp \
+ 	langlib.cpp \
+ 	listener.cpp \
+@@ -41,16 +40,13 @@ libtntnet_la_SOURCES = \
+ 	stringlessignorecase.cpp \
+ 	tntconfig.cpp \
+ 	tntnet.cpp \
+-	unzip.c \
+ 	unzipfile.cpp \
+ 	urlescostream.cpp \
+ 	urlmapper.cpp \
+ 	util.cpp \
+ 	worker.cpp \
+ 	zdata.cpp \
+-	crypt.h \
+-	ioapi.h \
+-	unzip.h
++	crypt.h
+ 
+ nobase_include_HEADERS = \
+ 	tnt/applicationunlocker.h \
+@@ -145,3 +141,13 @@ noinst_HEADERS += \
+ 	tnt/stressjob.h
+ endif
+ 
++if HAVE_MINIZIP
++libtntnet_la_CXXFLAGS += $(MINIZIP_CFLAGS)
++libtntnet_la_LDFLAGS += $(MINIZIP_LIBS)
++else
++libtntnet_la_SOURCES += \
++	ioapi.c \
++	ioapi.h \
++	unzip.c \
++	unzip.h
++endif
diff --git a/dev-libs/tntnet/tntnet-2.3_rc1.ebuild b/dev-libs/tntnet/tntnet-2.3_rc1.ebuild
index db986a68deeac483bee25af8b6f99d49f45ce823..4d602ac02b3420c2a1f1f367f7a767efc7c10447 100644
--- a/dev-libs/tntnet/tntnet-2.3_rc1.ebuild
+++ b/dev-libs/tntnet/tntnet-2.3_rc1.ebuild
@@ -34,6 +34,10 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
+	# Both fixed in the next release
+	epatch "${FILESDIR}"/${PN}-2.0-zlib-minizip.patch
+	rm framework/common/{ioapi,unzip}.[ch] || die
+
 	# bug 423697
 	sed -e "s:unzip.h:minizip/unzip.h:" -i framework/defcomp/unzipcomp.cpp