diff --git a/net-p2p/libtorrent-rasterbar/Makefile b/net-p2p/libtorrent-rasterbar/Makefile
index 45fad884292f..bd415e47300d 100644
--- a/net-p2p/libtorrent-rasterbar/Makefile
+++ b/net-p2p/libtorrent-rasterbar/Makefile
@@ -1,76 +1,69 @@
 PORTNAME=	libtorrent-rasterbar
-DISTVERSION=	1.2.16 # 2.x is unusable until memory problems are resolved, see https://github.com/arvidn/libtorrent/issues/6781
-PORTREVISION=	2
+DISTVERSION=	1.2.18 # 2.x is unusable until memory problems are resolved, see https://github.com/arvidn/libtorrent/issues/6781
 PORTEPOCH=	2
 CATEGORIES=	net-p2p
 MASTER_SITES=	https://github.com/arvidn/libtorrent/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ library implementing a BitTorrent client
 WWW=		https://libtorrent.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libboost_chrono.so:devel/boost-libs \
 		libboost_random.so:devel/boost-libs \
 		libboost_system.so:devel/boost-libs
 
-USES=		cmake compiler:c++11-lib iconv:wchar_t libtool localbase:ldflags pathfix pkgconfig python:test shebangfix ssl
+USES=		cmake compiler:c++17-lang iconv:wchar_t libtool localbase:ldflags pathfix pkgconfig python:test shebangfix ssl
 SHEBANG_FILES=	test/socks.py test/web_server.py
 USE_LDCONFIG=	yes
 
 USE_CXXSTD=	c++17 # prevent boost-related SEGV, see bug#264278
 
 LDFLAGS+=	${ICONV_LIB}
 
 SHLIB_VER=	10
 PLIST_SUB+=	SHLIB_VER="${SHLIB_VER}" SO_VER="${DISTVERSION}"
 
 DOCFILES=	AUTHORS ChangeLog
 PORTDOCS=	${DOCFILES} docs/*
 PORTEXAMPLES=	*.cpp
 
 OPTIONS_DEFINE=		DOCS EXAMPLES LOGGING
 OPTIONS_DEFAULT=	LOGGING
 OPTIONS_SUB=		yes
 LOGGING_DESC=		Enable logging to disk
 
 EXAMPLES_CMAKE_BOOL=	build_examples
 LOGGING_CMAKE_BOOL=	logging
 
 PORTSCOUT=	limit:^1.* # 2.x is WIP and we don't accept it before qBittorrent does
 
 CONFLICTS_INSTALL=	libtorrent-rasterbar2
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|return "python3";|return "${PYTHON_CMD}";|' \
 		${WRKSRC}/test/setup_transfer.cpp
 
 post-install:
 	@${RM} ${STAGEDIR}${PREFIX}/include/libtorrent/Makefile*
-	# Workaround for -DTHREADS_HAVE_PTHREAD_ARG:BOOL=YES being set in
-	# Mk/Uses/cmake.mk
-	# References:   https://mariadb.atlassian.net/browse/MDEV-9388
-	#               https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=206169
-	@${REINPLACE_CMD} 's/-l-pthread/-lpthread/' \
-		${STAGEDIR}${PREFIX}/libdata/pkgconfig/libtorrent-rasterbar.pc
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCFILES:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR}
 	${RM} ${STAGEDIR}${DOCSDIR}/docs/._*
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/${PORTEXAMPLES} \
 		${STAGEDIR}${EXAMPLESDIR}
 
 do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -Dbuild_tests:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
diff --git a/net-p2p/libtorrent-rasterbar/distinfo b/net-p2p/libtorrent-rasterbar/distinfo
index b92e4799dff6..3a5bf2e104b0 100644
--- a/net-p2p/libtorrent-rasterbar/distinfo
+++ b/net-p2p/libtorrent-rasterbar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1654705780
-SHA256 (libtorrent-rasterbar-1.2.16.tar.gz) = 5bdc221662541abdc324ded0a74b5cd3f30e6260871080b4a4b3295fb09f02e0
-SIZE (libtorrent-rasterbar-1.2.16.tar.gz) = 4163867
+TIMESTAMP = 1669713819
+SHA256 (libtorrent-rasterbar-1.2.18.tar.gz) = fef2b6817de4e6d960e019c27f21daf27bc2468a81d9e028a19d45d61456fa72
+SIZE (libtorrent-rasterbar-1.2.18.tar.gz) = 4178407