diff --git a/net-p2p/libtorrent-rasterbar/Makefile b/net-p2p/libtorrent-rasterbar/Makefile
index bd415e47300d..1692742f4ad2 100644
--- a/net-p2p/libtorrent-rasterbar/Makefile
+++ b/net-p2p/libtorrent-rasterbar/Makefile
@@ -1,69 +1,72 @@
 PORTNAME=	libtorrent-rasterbar
 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++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:
+	# py-bindings seems to link this exact name after v1.2.14
+	# TODO: figure out how to make symlinks in Jamfile
+	/bin/ln -s libtorrent-rasterbar.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib/libtorrent-rasterbar.so.10.0.0
 	@${RM} ${STAGEDIR}${PREFIX}/include/libtorrent/Makefile*
 
 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/pkg-plist b/net-p2p/libtorrent-rasterbar/pkg-plist
index 4f8d8ff4b883..84471c859fe8 100644
--- a/net-p2p/libtorrent-rasterbar/pkg-plist
+++ b/net-p2p/libtorrent-rasterbar/pkg-plist
@@ -1,256 +1,257 @@
 include/libtorrent/add_torrent_params.hpp
 include/libtorrent/address.hpp
 include/libtorrent/alert.hpp
 include/libtorrent/alert_manager.hpp
 include/libtorrent/alert_types.hpp
 include/libtorrent/announce_entry.hpp
 include/libtorrent/assert.hpp
 include/libtorrent/aux_/aligned_storage.hpp
 include/libtorrent/aux_/aligned_union.hpp
 include/libtorrent/aux_/alloca.hpp
 include/libtorrent/aux_/allocating_handler.hpp
 include/libtorrent/aux_/array.hpp
 include/libtorrent/aux_/bind_to_device.hpp
 include/libtorrent/aux_/block_cache_reference.hpp
 include/libtorrent/aux_/byteswap.hpp
 include/libtorrent/aux_/container_wrapper.hpp
 include/libtorrent/aux_/cppint_import_export.hpp
 include/libtorrent/aux_/cpuid.hpp
 include/libtorrent/aux_/deferred_handler.hpp
 include/libtorrent/aux_/deprecated.hpp
 include/libtorrent/aux_/deque.hpp
 include/libtorrent/aux_/dev_random.hpp
 include/libtorrent/aux_/disable_warnings_pop.hpp
 include/libtorrent/aux_/disable_warnings_push.hpp
 include/libtorrent/aux_/disk_job_fence.hpp
 include/libtorrent/aux_/escape_string.hpp
 include/libtorrent/aux_/export.hpp
 include/libtorrent/aux_/file_progress.hpp
 include/libtorrent/aux_/ffs.hpp
 include/libtorrent/aux_/generate_peer_id.hpp
 include/libtorrent/aux_/has_block.hpp
 include/libtorrent/aux_/instantiate_connection.hpp
 include/libtorrent/aux_/io.hpp
 include/libtorrent/aux_/ip_notifier.hpp
 include/libtorrent/aux_/listen_socket_handle.hpp
 include/libtorrent/aux_/lsd.hpp
 include/libtorrent/aux_/keepalive.hpp
 include/libtorrent/aux_/merkle.hpp
 include/libtorrent/aux_/noexcept_movable.hpp
 include/libtorrent/aux_/numeric_cast.hpp
 include/libtorrent/aux_/openssl.hpp
 include/libtorrent/aux_/path.hpp
 include/libtorrent/aux_/pool.hpp
 include/libtorrent/aux_/portmap.hpp
 include/libtorrent/aux_/proxy_settings.hpp
 include/libtorrent/aux_/range.hpp
 include/libtorrent/aux_/route.h
 include/libtorrent/aux_/scope_end.hpp
 include/libtorrent/aux_/session_call.hpp
 include/libtorrent/aux_/session_impl.hpp
 include/libtorrent/aux_/session_interface.hpp
 include/libtorrent/aux_/session_settings.hpp
 include/libtorrent/aux_/session_udp_sockets.hpp
 include/libtorrent/aux_/set_socket_buffer.hpp
 include/libtorrent/aux_/set_traffic_class.hpp
 include/libtorrent/aux_/socket_type.hpp
 include/libtorrent/aux_/storage_piece_set.hpp
 include/libtorrent/aux_/storage_utils.hpp
 include/libtorrent/aux_/string_ptr.hpp
 include/libtorrent/aux_/suggest_piece.hpp
 include/libtorrent/aux_/throw.hpp
 include/libtorrent/aux_/time.hpp
 include/libtorrent/aux_/torrent_impl.hpp
 include/libtorrent/aux_/unique_ptr.hpp
 include/libtorrent/aux_/vector.hpp
 include/libtorrent/aux_/win_crypto_provider.hpp
 include/libtorrent/aux_/win_util.hpp
 include/libtorrent/aux_/windows.hpp
 include/libtorrent/bandwidth_limit.hpp
 include/libtorrent/bandwidth_manager.hpp
 include/libtorrent/bandwidth_queue_entry.hpp
 include/libtorrent/bandwidth_socket.hpp
 include/libtorrent/bdecode.hpp
 include/libtorrent/bencode.hpp
 include/libtorrent/bitfield.hpp
 include/libtorrent/block_cache.hpp
 include/libtorrent/bloom_filter.hpp
 include/libtorrent/broadcast_socket.hpp
 include/libtorrent/bt_peer_connection.hpp
 include/libtorrent/buffer.hpp
 include/libtorrent/chained_buffer.hpp
 include/libtorrent/choker.hpp
 include/libtorrent/close_reason.hpp
 include/libtorrent/config.hpp
 include/libtorrent/copy_ptr.hpp
 include/libtorrent/crc32c.hpp
 include/libtorrent/create_torrent.hpp
 include/libtorrent/deadline_timer.hpp
 include/libtorrent/debug.hpp
 include/libtorrent/disk_buffer_holder.hpp
 include/libtorrent/disk_buffer_pool.hpp
 include/libtorrent/disk_interface.hpp
 include/libtorrent/disk_io_job.hpp
 include/libtorrent/disk_io_thread.hpp
 include/libtorrent/disk_io_thread_pool.hpp
 include/libtorrent/disk_job_pool.hpp
 include/libtorrent/disk_observer.hpp
 include/libtorrent/download_priority.hpp
 include/libtorrent/ed25519.hpp
 include/libtorrent/entry.hpp
 include/libtorrent/enum_net.hpp
 include/libtorrent/error.hpp
 include/libtorrent/error_code.hpp
 include/libtorrent/extensions.hpp
 include/libtorrent/extensions/smart_ban.hpp
 include/libtorrent/extensions/ut_metadata.hpp
 include/libtorrent/extensions/ut_pex.hpp
 include/libtorrent/file.hpp
 include/libtorrent/file_pool.hpp
 include/libtorrent/file_storage.hpp
 include/libtorrent/fingerprint.hpp
 include/libtorrent/flags.hpp
 include/libtorrent/fwd.hpp
 include/libtorrent/gzip.hpp
 include/libtorrent/hasher.hpp
 include/libtorrent/hasher512.hpp
 include/libtorrent/heterogeneous_queue.hpp
 include/libtorrent/hex.hpp
 include/libtorrent/http_connection.hpp
 include/libtorrent/http_parser.hpp
 include/libtorrent/http_seed_connection.hpp
 include/libtorrent/http_stream.hpp
 include/libtorrent/http_tracker_connection.hpp
 include/libtorrent/i2p_stream.hpp
 include/libtorrent/identify_client.hpp
 include/libtorrent/index_range.hpp
 include/libtorrent/invariant_check.hpp
 include/libtorrent/io.hpp
 include/libtorrent/io_service.hpp
 include/libtorrent/io_service_fwd.hpp
 include/libtorrent/ip_filter.hpp
 include/libtorrent/ip_voter.hpp
 include/libtorrent/kademlia/announce_flags.hpp
 include/libtorrent/kademlia/dht_observer.hpp
 include/libtorrent/kademlia/dht_settings.hpp
 include/libtorrent/kademlia/dht_state.hpp
 include/libtorrent/kademlia/dht_storage.hpp
 include/libtorrent/kademlia/dht_tracker.hpp
 include/libtorrent/kademlia/direct_request.hpp
 include/libtorrent/kademlia/dos_blocker.hpp
 include/libtorrent/kademlia/ed25519.hpp
 include/libtorrent/kademlia/find_data.hpp
 include/libtorrent/kademlia/get_item.hpp
 include/libtorrent/kademlia/get_peers.hpp
 include/libtorrent/kademlia/io.hpp
 include/libtorrent/kademlia/item.hpp
 include/libtorrent/kademlia/msg.hpp
 include/libtorrent/kademlia/node.hpp
 include/libtorrent/kademlia/node_entry.hpp
 include/libtorrent/kademlia/node_id.hpp
 include/libtorrent/kademlia/observer.hpp
 include/libtorrent/kademlia/put_data.hpp
 include/libtorrent/kademlia/refresh.hpp
 include/libtorrent/kademlia/routing_table.hpp
 include/libtorrent/kademlia/rpc_manager.hpp
 include/libtorrent/kademlia/sample_infohashes.hpp
 include/libtorrent/kademlia/traversal_algorithm.hpp
 include/libtorrent/kademlia/types.hpp
 include/libtorrent/lazy_entry.hpp
 include/libtorrent/link.hpp
 include/libtorrent/linked_list.hpp
 include/libtorrent/lsd.hpp
 include/libtorrent/magnet_uri.hpp
 include/libtorrent/natpmp.hpp
 include/libtorrent/netlink.hpp
 include/libtorrent/operations.hpp
 include/libtorrent/optional.hpp
 include/libtorrent/packet_buffer.hpp
 include/libtorrent/packet_pool.hpp
 include/libtorrent/parse_url.hpp
 include/libtorrent/part_file.hpp
 include/libtorrent/pe_crypto.hpp
 include/libtorrent/pex_flags.hpp
 include/libtorrent/peer.hpp
 include/libtorrent/peer_class.hpp
 include/libtorrent/peer_class_set.hpp
 include/libtorrent/peer_class_type_filter.hpp
 include/libtorrent/peer_connection.hpp
 include/libtorrent/peer_connection_handle.hpp
 include/libtorrent/peer_connection_interface.hpp
 include/libtorrent/peer_id.hpp
 include/libtorrent/peer_info.hpp
 include/libtorrent/peer_list.hpp
 include/libtorrent/peer_request.hpp
 include/libtorrent/performance_counters.hpp
 include/libtorrent/piece_block.hpp
 include/libtorrent/piece_block_progress.hpp
 include/libtorrent/piece_picker.hpp
 include/libtorrent/platform_util.hpp
 include/libtorrent/portmap.hpp
 include/libtorrent/proxy_base.hpp
 include/libtorrent/puff.hpp
 include/libtorrent/random.hpp
 include/libtorrent/read_resume_data.hpp
 include/libtorrent/receive_buffer.hpp
 include/libtorrent/request_blocks.hpp
 include/libtorrent/resolve_links.hpp
 include/libtorrent/resolver.hpp
 include/libtorrent/resolver_interface.hpp
 include/libtorrent/session.hpp
 include/libtorrent/session_handle.hpp
 include/libtorrent/session_settings.hpp
 include/libtorrent/session_stats.hpp
 include/libtorrent/session_status.hpp
 include/libtorrent/session_types.hpp
 include/libtorrent/settings_pack.hpp
 include/libtorrent/sha1.hpp
 include/libtorrent/sha1_hash.hpp
 include/libtorrent/sha512.hpp
 include/libtorrent/sliding_average.hpp
 include/libtorrent/socket.hpp
 include/libtorrent/socket_io.hpp
 include/libtorrent/socks5_stream.hpp
 include/libtorrent/span.hpp
 include/libtorrent/ssl_stream.hpp
 include/libtorrent/stack_allocator.hpp
 include/libtorrent/stat.hpp
 include/libtorrent/stat_cache.hpp
 include/libtorrent/storage.hpp
 include/libtorrent/storage_defs.hpp
 include/libtorrent/string_util.hpp
 include/libtorrent/string_view.hpp
 include/libtorrent/tailqueue.hpp
 include/libtorrent/time.hpp
 include/libtorrent/timestamp_history.hpp
 include/libtorrent/torrent.hpp
 include/libtorrent/torrent_flags.hpp
 include/libtorrent/torrent_handle.hpp
 include/libtorrent/torrent_info.hpp
 include/libtorrent/torrent_peer.hpp
 include/libtorrent/torrent_peer_allocator.hpp
 include/libtorrent/torrent_status.hpp
 include/libtorrent/tracker_manager.hpp
 include/libtorrent/udp_socket.hpp
 include/libtorrent/udp_tracker_connection.hpp
 include/libtorrent/union_endpoint.hpp
 include/libtorrent/units.hpp
 include/libtorrent/upnp.hpp
 include/libtorrent/utf8.hpp
 include/libtorrent/utp_socket_manager.hpp
 include/libtorrent/utp_stream.hpp
 include/libtorrent/vector_utils.hpp
 include/libtorrent/version.hpp
 include/libtorrent/web_connection_base.hpp
 include/libtorrent/web_peer_connection.hpp
 include/libtorrent/write_resume_data.hpp
 include/libtorrent/xml_parse.hpp
 lib/cmake/LibtorrentRasterbar/LibtorrentRasterbarConfig.cmake
 lib/cmake/LibtorrentRasterbar/LibtorrentRasterbarConfigVersion.cmake
 lib/cmake/LibtorrentRasterbar/LibtorrentRasterbarTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/LibtorrentRasterbar/LibtorrentRasterbarTargets.cmake
 lib/libtorrent-rasterbar.so
 lib/libtorrent-rasterbar.so.%%SO_VER%%
 lib/libtorrent-rasterbar.so.%%SHLIB_VER%%
+lib/libtorrent-rasterbar.so.10.0.0
 libdata/pkgconfig/libtorrent-rasterbar.pc
 share/cmake/Modules/FindLibtorrentRasterbar.cmake
diff --git a/net-p2p/py-libtorrent-rasterbar/Makefile b/net-p2p/py-libtorrent-rasterbar/Makefile
index 548a83e953d7..9ac5f8a6d6a2 100644
--- a/net-p2p/py-libtorrent-rasterbar/Makefile
+++ b/net-p2p/py-libtorrent-rasterbar/Makefile
@@ -1,44 +1,46 @@
 PORTNAME=	libtorrent-rasterbar
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.2.16
-PORTREVISION=	1
+DISTVERSION=	1.2.18
+PORTREVISION=	0
 PORTEPOCH=	2
 CATEGORIES=	net-p2p python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python bindings for libtorrent-rasterbar
 WWW=		https://libtorrent.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/../../COPYING
 
-BROKEN=		can't create dynamic relocation R_X86_64_32 against local symbol in readonly segment, see https://github.com/arvidn/libtorrent/issues/6890
-
 BUILD_DEPENDS=	b2:devel/boost_build
 LIB_DEPENDS=	libtorrent-rasterbar.so:net-p2p/libtorrent-rasterbar \
 		${PY_BOOST}
 
 USES=		compiler:c11 iconv localbase:ldflags python:3.6+
 USE_GITHUB=	yes
 GH_ACCOUNT=	arvidn
 GH_PROJECT=	libtorrent
-USE_PYTHON=	distutils autoplist
+USE_PYTHON=	distutils
+PYDISTUTILS_PKGNAME=	libtorrent
+PYDISTUTILS_BUILD_TARGET=	build_ext --b2-args="fpic=on libtorrent-link=shared boost-link=shared"
+PYDISTUTILS_INSTALL_TARGET=	build_ext --b2-args="fpic=on libtorrent-link=shared boost-link=shared" install
 
 BINARY_ALIAS=	b2=${FILESDIR}/b2
 
 CFLAGS+=	-DTORRENT_DISABLE_LOGGING # undefined symbol: https://github.com/arvidn/libtorrent/issues/3331
 LDFLAGS+=	${LOCALBASE}/lib/libboost_python${PYTHON_SUFFIX}.so ${LOCALBASE}/lib/libiconv.so # fails to link libs: https://github.com/arvidn/libtorrent/issues/3330
 
 WRKSRC_SUBDIR=	bindings/python
 
 # ensure python paths are correctly identified
 CONFIGURE_ENV=	PYTHON_INCLUDEDIR="${PYTHON_INCLUDEDIR}" \
 		PYTHON_VERSION="${PYTHON_VERSION}"
 
 PORTSCOUT=	limit:^1.* # 2.x is WIP and we don't accept it before qBittorrent does
 
+PLIST_FILES+=	${PYTHON_SITELIBDIR}/${PYDISTUTILS_PKGNAME}/__init__${PYTHON_EXT_SUFFIX}.so
 post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/libtorrent*.so
+	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PYDISTUTILS_PKGNAME}/__init__${PYTHON_EXT_SUFFIX}.so
 
 .include <bsd.port.mk>
diff --git a/net-p2p/py-libtorrent-rasterbar/distinfo b/net-p2p/py-libtorrent-rasterbar/distinfo
index 8f090fecfde8..3ff41462afa4 100644
--- a/net-p2p/py-libtorrent-rasterbar/distinfo
+++ b/net-p2p/py-libtorrent-rasterbar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1654714860
-SHA256 (arvidn-libtorrent-v1.2.16_GH0.tar.gz) = 2ee435c3e2e6dd8825903230b41fbaf0741b7aed57094f2ca0e6214d89fef9d4
-SIZE (arvidn-libtorrent-v1.2.16_GH0.tar.gz) = 3624920
+TIMESTAMP = 1667577329
+SHA256 (arvidn-libtorrent-v1.2.18_GH0.tar.gz) = c4213bfb695db3e3b266be71865a7942f9007200aa4021946818fdc5e5e4a3d3
+SIZE (arvidn-libtorrent-v1.2.18_GH0.tar.gz) = 3633926