diff --git a/net-p2p/qbittorrent/Makefile b/net-p2p/qbittorrent/Makefile
index f9e81b94dbc8..fdcc0fe28a4b 100644
--- a/net-p2p/qbittorrent/Makefile
+++ b/net-p2p/qbittorrent/Makefile
@@ -1,75 +1,82 @@
 PORTNAME=	qbittorrent
 DISTVERSION=	4.5.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES=	5b90e222a80849f346d0b12752aa1f7a9fb839fc.patch:-p1 # PR: Enable DBUS cmake option on FreeBSD
+
 MAINTAINER=	yuri@FreeBSD.org
-COMMENT=	Bittorrent client using Qt5 and libtorrent-rasterbar
+COMMENT=	Bittorrent client using Qt6 and libtorrent-rasterbar
 WWW=		https://www.qbittorrent.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_FreeBSD_12_powerpc64=	fails to build: ./base/tristatebool.h:44:5: 'constexpr' constructor does not have empty body
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs
 
 CXXFLAGS+=	-DBOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED # error: "Boost.Stacktrace requires `_Unwind_Backtrace` function. Define `_GNU_SOURCE` macro or `BOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED` if _Unwind_Backtrace is available without `_GNU_SOURCE`."
 
 FLAVORS=	default nox
 FLAVOR?=	${FLAVORS:[1]}
 nox_PKGNAMESUFFIX=	-nox
 nox_PLIST=		${MASTERDIR}/pkg-plist-nox
 
 USES=			compiler:c++14-lang cpe pkgconfig cmake qt:6 ssl tar:xz
 USE_QT=			base svg translations
 USE_CXXSTD=		c++17 # prevent boost-related SEGV, see bug#264278
 
+USE_GITHUB=		nodefault
+GH_ACCOUNT=		qBittorrent
+GH_PROJECT=		qBittorrent
+
 CMAKE_ON=		QT6
 
 .if ${FLAVOR} == default
 USES+=			desktop-file-utils gl
 USE_GL=			gl
+CMAKE_OFF=		WEBUI
 .endif
 
 .if ${FLAVOR} == nox
-SUFFIX=			-nox
 COMMENT+=		(web UI version)
 CMAKE_OFF=		GUI
 USERS=			qbittorrent
 GROUPS=			qbittorrent
 USE_RC_SUBR=		qbittorrent
 SUB_LIST=		USER=${USERS} GROUP=${GROUPS}
 PLIST_SUB=		USER=${USERS} GROUP=${GROUPS}
 OPTIONS_EXCLUDE=	DBUS
 .endif
 
 OPTIONS_DEFINE=			DBUS PYTHON DEBUG
 OPTIONS_RADIO=			LIBTORRENT
 OPTIONS_RADIO_LIBTORRENT=	LIBTORRENT1 LIBTORRENT2
 OPTIONS_DEFAULT=		DBUS PYTHON LIBTORRENT1
 
 LIBTORRENT_DESC=	libtorrent version number to use
 LIBTORRENT1_DESC=	Version 1.x (default)
 LIBTORRENT2_DESC=	Version 2.x (experimental)
 
 DEBUG_CMAKE_BOOL=	debug
 DBUS_CMAKE_BOOL=	DBUS
 
 LIBTORRENT1_BUILD_DEPENDS=	libtorrent-rasterbar>0:net-p2p/libtorrent-rasterbar
 LIBTORRENT1_RUN_DEPENDS=	libtorrent-rasterbar>0:net-p2p/libtorrent-rasterbar
 LIBTORRENT2_BUILD_DEPENDS=	libtorrent-rasterbar2>0:net-p2p/libtorrent-rasterbar2
 LIBTORRENT2_RUN_DEPENDS=	libtorrent-rasterbar2>0:net-p2p/libtorrent-rasterbar2
 LIBTORRENT2_EXTRA_PATCHES=	${FILESDIR}/extrapatch-libtorrent-rasterbar2-settings
 
 PYTHON_DESC=		Install Python to support some plugin functionality
 PYTHON_USES=		python:run
 PYTHON_BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 post-install:
 .if ${FLAVOR} == nox
 	@${MKDIR} ${STAGEDIR}/var/db/qbittorrent/conf ${STAGEDIR}/var/db/qbittorrent/Downloads
 .endif
 
 .include <bsd.port.mk>
diff --git a/net-p2p/qbittorrent/distinfo b/net-p2p/qbittorrent/distinfo
index e449ea81aa96..fe0a65ce300a 100644
--- a/net-p2p/qbittorrent/distinfo
+++ b/net-p2p/qbittorrent/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1693369887
+TIMESTAMP = 1693756018
 SHA256 (qbittorrent-4.5.5.tar.xz) = 8e84a5ba63c7203cfb2e5bb23e27d000120fb8e9dfb6e9f9a1064dce1b9294e9
 SIZE (qbittorrent-4.5.5.tar.xz) = 4352524
+SHA256 (5b90e222a80849f346d0b12752aa1f7a9fb839fc.patch) = 2f04e36efa91d30042e222f9a11fb386d46e81a7cd45be74ad6a66ab4ef65c36
+SIZE (5b90e222a80849f346d0b12752aa1f7a9fb839fc.patch) = 1410