diff --git a/mail/rspamd-devel/Makefile b/mail/rspamd-devel/Makefile
index 1e0f8802123a..9712385b5a45 100644
--- a/mail/rspamd-devel/Makefile
+++ b/mail/rspamd-devel/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	rspamd
 PORTVERSION=	2.6.a1.20200929
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-devel
 
diff --git a/mail/rspamd-devel/files/pkg-message.in b/mail/rspamd-devel/files/pkg-message.in
index e0f07f35b209..927f2a5b46ac 100644
--- a/mail/rspamd-devel/files/pkg-message.in
+++ b/mail/rspamd-devel/files/pkg-message.in
@@ -5,6 +5,9 @@
 
      rspamd_enable="YES"
 
+ - Optionally you can adjust the user which runs Rspamd workers with the
+   variables rspamd_worker_user and rspamd_worker_group (default rspamd:rspamd).
+
  - A symbolic link to %%ETCDIR%%/rspamd.newsyslog.conf
    has been created in the /usr/local/etc/newsyslog.conf.d directory.
    You can edit %%ETCDIR%%/rspamd.newsyslog.conf
diff --git a/mail/rspamd-devel/files/rspamd.in b/mail/rspamd-devel/files/rspamd.in
index b605115cb77e..d8fc0b8bb8f1 100644
--- a/mail/rspamd-devel/files/rspamd.in
+++ b/mail/rspamd-devel/files/rspamd.in
@@ -12,9 +12,9 @@
 # rspamd_enable (bool):		Set to "NO" by default.
 #				Set it to "YES" to enable rspamd.
 #
-# rspamd_user (str):		Default to "rspamd".
+# rspamd_worker_user (str):	Default to "rspamd".
 #
-# rspamd_group (str):		Default to "rspamd".
+# rspamd_worker_group (str):	Default to "rspamd".
 #
 # rspamd_flags (str):		Default to "-c %%PREFIX%%/etc/rspamd.conf".
 
@@ -26,8 +26,8 @@ rcvar=rspamd_enable
 load_rc_config $name
 
 : ${rspamd_enable:="NO"}
-: ${rspamd_user="rspamd"}
-: ${rspamd_group="rspamd"}
+: ${rspamd_worker_user="rspamd"}
+: ${rspamd_worker_group="rspamd"}
 : ${rspamd_flags="-c %%PREFIX%%/etc/rspamd/rspamd.conf"}
 
 pidfile=${rspamd_pidfile:-"/var/run/rspamd/rspamd.pid"}
@@ -40,7 +40,7 @@ configtest_cmd="rspamd_checkconfig"
 reopenlog_cmd="reopenlog_cmd"
 
 required_files=%%PREFIX%%/etc/rspamd/rspamd.conf
-command_args="-u ${rspamd_user} -g ${rspamd_group}"
+command_args="-u ${rspamd_worker_user} -g ${rspamd_worker_group}"
 extra_commands="reload configtest reopenlog"
 stop_postcmd="rm -f $pidfile"
 sig_reload="HUP"
diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index d304470a3413..c287bad613b6 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	rspamd
 PORTVERSION=	2.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 
 MAINTAINER=	vsevolod@FreeBSD.org
diff --git a/mail/rspamd/files/pkg-message.in b/mail/rspamd/files/pkg-message.in
index e0f07f35b209..927f2a5b46ac 100644
--- a/mail/rspamd/files/pkg-message.in
+++ b/mail/rspamd/files/pkg-message.in
@@ -5,6 +5,9 @@
 
      rspamd_enable="YES"
 
+ - Optionally you can adjust the user which runs Rspamd workers with the
+   variables rspamd_worker_user and rspamd_worker_group (default rspamd:rspamd).
+
  - A symbolic link to %%ETCDIR%%/rspamd.newsyslog.conf
    has been created in the /usr/local/etc/newsyslog.conf.d directory.
    You can edit %%ETCDIR%%/rspamd.newsyslog.conf
diff --git a/mail/rspamd/files/rspamd.in b/mail/rspamd/files/rspamd.in
index b605115cb77e..d8fc0b8bb8f1 100644
--- a/mail/rspamd/files/rspamd.in
+++ b/mail/rspamd/files/rspamd.in
@@ -12,9 +12,9 @@
 # rspamd_enable (bool):		Set to "NO" by default.
 #				Set it to "YES" to enable rspamd.
 #
-# rspamd_user (str):		Default to "rspamd".
+# rspamd_worker_user (str):	Default to "rspamd".
 #
-# rspamd_group (str):		Default to "rspamd".
+# rspamd_worker_group (str):	Default to "rspamd".
 #
 # rspamd_flags (str):		Default to "-c %%PREFIX%%/etc/rspamd.conf".
 
@@ -26,8 +26,8 @@ rcvar=rspamd_enable
 load_rc_config $name
 
 : ${rspamd_enable:="NO"}
-: ${rspamd_user="rspamd"}
-: ${rspamd_group="rspamd"}
+: ${rspamd_worker_user="rspamd"}
+: ${rspamd_worker_group="rspamd"}
 : ${rspamd_flags="-c %%PREFIX%%/etc/rspamd/rspamd.conf"}
 
 pidfile=${rspamd_pidfile:-"/var/run/rspamd/rspamd.pid"}
@@ -40,7 +40,7 @@ configtest_cmd="rspamd_checkconfig"
 reopenlog_cmd="reopenlog_cmd"
 
 required_files=%%PREFIX%%/etc/rspamd/rspamd.conf
-command_args="-u ${rspamd_user} -g ${rspamd_group}"
+command_args="-u ${rspamd_worker_user} -g ${rspamd_worker_group}"
 extra_commands="reload configtest reopenlog"
 stop_postcmd="rm -f $pidfile"
 sig_reload="HUP"