diff --git a/net-p2p/bazarr/Makefile b/net-p2p/bazarr/Makefile
index 330646885d17..23d3df9de60b 100644
--- a/net-p2p/bazarr/Makefile
+++ b/net-p2p/bazarr/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	bazarr
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.9.7
+DISTVERSION=	0.9.9
 CATEGORIES=	net-p2p python
-# Grab the asset as it contains built frontend and some extra files
 MASTER_SITES=	https://github.com/morpheus65535/bazarr/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
 DISTNAME=	bazarr
+DIST_SUBDIR=	${PORTNAME}/${DISTVERSION}
 
 MAINTAINER=	michiel@vanbaak.eu
 COMMENT=	Automatic subtitle downloader for Radarr and Sonarr
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	${PYNUMPY} \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}gevent-websocket>=0.10.1:www/py-gevent-websocket@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}gevent>=21:devel/py-gevent@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>=4.3.0:devel/py-lxml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}webrtcvad>=2.0.10:audio/py-webrtcvad@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}gevent>=21:devel/py-gevent@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}gevent-websocket>=0.10.1:www/py-gevent-websocket@${PY_FLAVOR} \
 		ffprobe:multimedia/ffmpeg \
 		unrar:archivers/unrar
 
 USES=		python:3.7+ zip
 
 USE_RC_SUBR=	bazarr
 
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD} \
 		USERS=${USERS}
 
 NO_WRKSUBDIR=	yes
 
 USERS=		bazarr
 GROUPS=		bazarr
 
 do-build:
 	@${PYTHON_CMD} -m compileall ${WRKSRC}
 	@${PYTHON_CMD} -O -m compileall ${WRKSRC}
 
 do-install:
 	${INSTALL} -d -m 755 ${STAGEDIR}/${DATADIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}/${DATADIR}
 
 post-install:
 	@${FIND} -s ${STAGEDIR} -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/net-p2p/bazarr/distinfo b/net-p2p/bazarr/distinfo
index 814dbc0ad3d5..10dd35fc8e9a 100644
--- a/net-p2p/bazarr/distinfo
+++ b/net-p2p/bazarr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1628859721
-SHA256 (bazarr.zip) = 3b21f7fca2bc779a56bbe51bce0778374230a6e99b01eff8dcea3e2c683e12b7
-SIZE (bazarr.zip) = 35062032
+TIMESTAMP = 1631705961
+SHA256 (bazarr/0.9.9/bazarr.zip) = d107e3a3485acdb5793a2e610e4f3fcdcd6c45e44cce192390488b2118943ad9
+SIZE (bazarr/0.9.9/bazarr.zip) = 35118835