diff --git a/net-p2p/transmission-cli/Makefile b/net-p2p/transmission-cli/Makefile
index 1b61ac646877..20db92dc3ef6 100644
--- a/net-p2p/transmission-cli/Makefile
+++ b/net-p2p/transmission-cli/Makefile
@@ -26,6 +26,7 @@ USES+=		tar:xz
 CONFLICTS_INSTALL=	${PORTNAME}${PKGNAMESUFFIX}-2.5*
 
 OPTIONS_DEFINE=	LITE DOCS
+EXTRACT_AFTER_ARGS=--no-same-owner --no-same-permissions --exclude third-party
 
 .include <bsd.port.options.mk>
 
@@ -34,6 +35,10 @@ LIB_DEPENDS?=	${GEN_LIB_DEPENDS}
 
 # General dependencies
 GEN_LIB_DEPENDS=libcurl.so:${PORTSDIR}/ftp/curl \
+		libdht.so:${PORTSDIR}/devel/jech-dht \
+		libminiupnpc.so:${PORTSDIR}/net/miniupnpc \
+		libnatpmp.so:${PORTSDIR}/net/libnatpmp \
+		libutp.so:${PORTSDIR}/net/libutp \
 		libevent.so:${PORTSDIR}/devel/libevent2
 GEN_RUN_DEPENDS=${LOCALBASE}/share/transmission/web/index.html:${PORTSDIR}/www/transmission-web
 
@@ -41,12 +46,21 @@ GEN_RUN_DEPENDS=${LOCALBASE}/share/transmission/web/index.html:${PORTSDIR}/www/t
 USES+=		gmake iconv libtool pkgconfig
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib ${ICONV_LIB}
+CPPFLAGS+=	-I${LOCALBASE}/include -DWITH_UTP=1
+LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		${ICONV_LIB}
 CONFIGURE_ARGS=--with-zlib=/usr \
+		 --disable-utp \
+		 --enable-external-natpmp \
 		${EXTRA_CONF_ARGS}
 CONFIGURE_ENV=	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
-		OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto"
+		OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto" \
+		DHT_CFLAGS=" " \
+		DHT_LIBS="-ldht" \
+		LIBUTP_CFLAGS=" " \
+		LIBUTP_LIBS="-lutp" \
+		LIBUTP_LIBS_QT="-lutp"
+
 EXTRA_CONF_ARGS?=--enable-cli \
 		 --disable-daemon \
 		 --without-gtk \
@@ -82,6 +96,16 @@ general-patch:
 	@${REINPLACE_CMD} -e 's|utils \\|\\|g' \
 		${WRKSRC}/Makefile.in
 .endif
+# Don't conflict with patches but force system libraries
+	@${REINPLACE_CMD} -e 's|third-party \\|\\|g' \
+		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -Ee '/^DHT_(CFLAGS|LIBS)=/d' \
+		-e 's|third-party/[^ ]*Makefile||g' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} \
+		-e 's,TRANSMISSION_TOP}/third-party/dht/libdht.a,DHT_LIBS},' \
+		${WRKSRC}/qt/qtr.pro
+	@${ECHO_CMD} 'DHT_LIBS = @DHT_LIBS@' >>${WRKSRC}/qt/config.pri.in
 
 post-patch: general-patch