diff --git a/net-p2p/bazarr-devel/Makefile b/net-p2p/bazarr-devel/Makefile
index ef4afab32b54..5454e09678bb 100644
--- a/net-p2p/bazarr-devel/Makefile
+++ b/net-p2p/bazarr-devel/Makefile
@@ -1,46 +1,51 @@
 PORTNAME=	bazarr
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.3-beta.28
+PORTREVISION=	1
 CATEGORIES=	net-p2p python
 MASTER_SITES=	https://github.com/morpheus65535/bazarr/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
 PKGNAMESUFFIX=	-devel
 DISTNAME=	bazarr
 DIST_SUBDIR=	${PORTNAME}${PKGNAMESUFFIX}/${DISTVERSION}
 
 MAINTAINER=	michiel@vanbaak.eu
 COMMENT=	Automatic subtitle downloader for Radarr and Sonarr
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${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} \
 		ffprobe:multimedia/ffmpeg \
 		unrar:archivers/unrar
 
 USES=		python:3.7+ zip
 
 USE_RC_SUBR=	bazarr
 
+SUB_FILES=	${PORTNAME} package_info
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD} \
+		MAINTAINER=${MAINTAINER} \
+		PKGVERSION=${PKGVERSION} \
 		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}
+	${INSTALL} -d -m 755 ${STAGEDIR}/${DATADIR}/bin/
+	cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}/${DATADIR}/bin/
 
 post-install:
+	${INSTALL_DATA} ${WRKDIR}/package_info ${STAGEDIR}/${DATADIR}/
 	@${FIND} -s ${STAGEDIR} -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/net-p2p/bazarr-devel/files/bazarr.in b/net-p2p/bazarr-devel/files/bazarr.in
index 15c226c3d2d0..0202ec49d196 100644
--- a/net-p2p/bazarr-devel/files/bazarr.in
+++ b/net-p2p/bazarr-devel/files/bazarr.in
@@ -1,42 +1,42 @@
 #!/bin/sh
 #
 # Author: Michiel van Baak <michiel@vanbaak.eu>
 #
 # $FreeBSD: $
 #
 # PROVIDE: bazarr
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 
 # Add the following lines to /etc/rc.conf to enable bazarr:
 # bazarr_enable:   Set to NO by default. Set it to YES to enable it.
 # bazarr_user:     The user account bazarr daemon runs as what
 #                  you want it to be.
 # bazarr_datadir:  Directory where bazarr user data lives.
 #                  Default: /usr/local/bazarr
 
 . /etc/rc.subr
 
 name=bazarr
 rcvar=bazarr_enable
 
 load_rc_config ${name}
 
 : ${bazarr_enable:=NO}
 : ${bazarr_user:=%%USERS%%}
 : ${bazarr_datadir:="%%PREFIX%%/bazarr"}
 
 pidfile="${bazarr_datadir}/bazarr.pid"
 procname="%%PYTHON_CMD%%"
 command="/usr/sbin/daemon"
-command_args="-f -p ${pidfile} ${procname} %%DATADIR%%/bazarr.py --no-update -c ${bazarr_datadir}"
+command_args="-f -p ${pidfile} ${procname} %%DATADIR%%/bin/bazarr.py --no-update -c ${bazarr_datadir}"
 start_precmd=bazarr_precmd
 
 bazarr_precmd()
 {
 	if [ ! -d ${bazarr_datadir} ]; then
 		install -d -o ${bazarr_user} ${bazarr_datadir}
 	fi
 }
 
 run_rc_command "$1"
diff --git a/net-p2p/bazarr-devel/files/package_info.in b/net-p2p/bazarr-devel/files/package_info.in
new file mode 100644
index 000000000000..4c9d2e0dcbfe
--- /dev/null
+++ b/net-p2p/bazarr-devel/files/package_info.in
@@ -0,0 +1,5 @@
+PackageVersion=%%PKGVERSION%%
+PackageAuthor=%%MAINTAINER%%
+UpdateMethod=External
+UpdateMethodMessage=use 'pkg upgrade' or [create a PR](https://bugs.freebsd.org/bugzilla/enter_bug.cgi?component=Individual%20Port%28s%29&product=Ports%20%26%20Packages) requesting an update of the port
+Branch=development