diff --git a/www/py-hyperkitty/Makefile b/www/py-hyperkitty/Makefile
index 4e13ee659e9a..e84268f6ca52 100644
--- a/www/py-hyperkitty/Makefile
+++ b/www/py-hyperkitty/Makefile
@@ -1,40 +1,42 @@
 PORTNAME=	hyperkitty
 PORTVERSION=	1.3.12
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	einar@isnic.is
 COMMENT=	Web interface to access GNU Mailman v3 archives
 WWW=		https://gitlab.com/mailman/hyperkitty
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pdm-backend>0:devel/py-pdm-backend@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django_compressor>=1.3:www/py-django_compressor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-extensions>=1.3.7:www/py-django-extensions@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-gravatar2>=1.0.6:www/py-django-gravatar2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-haystack>=2.8.0:www/py-django-haystack@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-q2>=1.0.0:www/py-django-q2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django42>=4.2:www/py-django42@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-mailman3>=1.3.13:mail/py-django-mailman3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}djangorestframework>=3.0.0:www/py-djangorestframework@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}flufl.lock>=4.0:devel/py-flufl.lock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mailmanclient>=3.3.3:mail/py-mailmanclient@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mistune>=3.0:textproc/py-mistune@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=2.0:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>=2.0:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}robot-detection>=0.3:www/py-robot-detection@${PY_FLAVOR}
 
 USES=		python shebangfix
 USE_PYTHON=	autoplist concurrent pep517
 
 SHEBANG_FILES=	hyperkitty/contrib/check_hk_import \
 		hyperkitty/contrib/cleanarch3
 
+USE_RC_SUBR=	mailman-qcluster
 NO_ARCH=	yes
 
 post-extract:
 	${RM} -rf ${WRKSRC}/example_project
 
 .include <bsd.port.mk>
diff --git a/www/py-hyperkitty/files/mailman-qcluster.in b/www/py-hyperkitty/files/mailman-qcluster.in
new file mode 100644
index 000000000000..1ae4e16656b3
--- /dev/null
+++ b/www/py-hyperkitty/files/mailman-qcluster.in
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+# PROVIDE: mailman_qcluster
+# REQUIRE: mailman
+# KEYWORD: shutdown
+# 
+# Add these lines to /etc/rc.conf or /etc/rc.conf.local to enable
+# mailman:
+# 
+# mailman_qcluster_enable (bool):	Set to NO by default.
+# 					Set it to YES to enable mailman_qcluster.
+# mailman_qcluster_dir (path):		Set to %%PREFIX%%/mailman by default.
+# mailman_qcluster_user (str):		Set to mailman by default.
+
+. /etc/rc.subr
+
+name=mailman_qcluster
+rcvar=mailman_qcluster_enable
+
+load_rc_config $name
+
+: ${mailman_qcluster_enable:=NO}
+: ${mailman_qcluster_dir:="%%PREFIX%%/mailman"}
+: ${mailman_qcluster_user:="mailman"}
+
+_pidprefix="/var/run/mailman"
+pidfile="${_pidprefix}/${name}.pid"
+
+command=/usr/sbin/daemon
+command_args="-P ${pidfile} -f -ST ${name} -l mail ${mailman_qcluster_dir}/manage.py qcluster"
+
+required_files="${mailman_qcluster_dir}/settings.py"
+
+start_precmd="mailman_qcluster_precmd"
+
+mailman_qcluster_precmd()
+{
+	install -o ${mailman_qcluster_user} -d ${_pidprefix}
+	install -o ${mailman_qcluster_user} -m 0644 /dev/null ${pidfile}
+}
+
+run_rc_command "$1"
diff --git a/www/py-hyperkitty/pkg-message b/www/py-hyperkitty/pkg-message
new file mode 100644
index 000000000000..856d64f05424
--- /dev/null
+++ b/www/py-hyperkitty/pkg-message
@@ -0,0 +1,30 @@
+[
+{ type: install
+  message: <<EOM
+There are a few tasks in HyperKitty that need to be run at regular intervals.
+The example_project directory contains an example crontab file that you can
+put in your /etc/cron.d directory.
+
+To improve performance, HyperKitty uses a distributed task queue that offloads long operations to separate processes called “workers”. 
+To run the workers on startup, add hyperkitty_qcluster_enable="yes"
+in your /etc/rc.conf. These options must also be configured in rc.conf:
+
+- hyperkitty_qcluster_dir:  Path to directory where hyperkitty setup.py is located
+- hyperkitty_qcluster_user: The user that should run the asynchronous workers
+ 
+EOM
+}
+{ type: upgrade
+  message: <<EOM
+HyperKitty has been upgraded, you need to run the commands that will update the
+database schemas. Before updating any of those databases, it is recommended to
+shut down the webserver which serves HyperKitty (Apache HTTPd for example).
+
+To update the HyperKitty database, run:
+
+django-admin migrate --pythonpath example_project --settings settings
+After this command complete, your database will be updated, you can start your webserver again.
+
+EOM
+}
+]