diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile
index 16c3913c606b..4dc82ac149a1 100644
--- a/sysutils/py-salt/Makefile
+++ b/sysutils/py-salt/Makefile
@@ -1,131 +1,131 @@
 PORTNAME=	salt
 PORTVERSION=	3006.9
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	krion@FreeBSD.org
 COMMENT=	Distributed remote execution and configuration management system
 WWW=		https://pypi.org/project/salt/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>0:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}distro>=1.5.0:sysutils/py-distro@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}libcloud>=0.14.0:net/py-libcloud@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}msgpack>=0.3:devel/py-msgpack@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}progressbar>0:misc/py-progressbar@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=0.3.0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=1.0.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jmespath>0:devel/py-jmespath@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyinotify>0:devel/py-pyinotify@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}looseversion>0:devel/py-looseversion@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}croniter>0:sysutils/py-croniter@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setproctitle>0:devel/py-setproctitle@${PY_FLAVOR}
 
 USES=		cpe python
 
 CPE_VENDOR=	saltstack
 CPE_PRODUCT=	salt
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
 CONFLICTS=	py[0-9]*-salt-2019*
 
 # we must pass these options before the target name, and python.mk has no
 # early-arguments variable, so we have to manipulate the target
 PYDISTUTILS_INSTALL_TARGET=\
 	--salt-root-dir=/ \
 	--salt-config-dir=${ETCDIR} \
 	--salt-cache-dir=/var/cache/salt \
 	--salt-sock-dir=/var/run/salt \
 	--salt-srv-root-dir=${ETCDIR} \
 	--salt-base-file-roots-dir=${ETCDIR}/states \
 	--salt-base-pillar-roots-dir=${ETCDIR}/pillar \
 	--salt-base-master-roots-dir=${ETCDIR}/salt-master \
 	--salt-logs-dir=/var/log/salt \
 	--salt-pidfile-dir=/var/run \
 	install
 
 USE_RC_SUBR=	salt_api \
 		salt_master \
 		salt_minion \
 		salt_proxy \
 		salt_syndic
 
 SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
 
 SUB_FILES=	pkg-message
 
 # Upstream archive contains files with UTF-8 names
 EXTRACT_CMD=	${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar
 
 OPTIONS_DEFINE=	AWS BASH FISH TCP ZEROMQ ZSH
 OPTIONS_DEFAULT=	BASH FISH ZEROMQ ZSH
 
 AWS_DESC=	Install dependencies required for Amazon Web Services
 TCP_DESC=	Install dependencies required for TCP transport
 ZEROMQ_DESC=	Install dependencies required for ZeroMQ transport
 
 # AWS dependencies (Note: the devel/py-botocore port is updated very frequently)
 AWS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}boto>=2.32.1:devel/py-boto@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}botocore>0:devel/py-botocore@${PY_FLAVOR}
 
 TCP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycryptodomex>=3.9.7:security/py-pycryptodomex@${PY_FLAVOR}
 
 ZEROMQ_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq@${PY_FLAVOR}
 ZEROMQ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pycryptodomex>=3.9.7:security/py-pycryptodomex@${PY_FLAVOR}
 
 BASH_PLIST_FILES=	share/bash-completion/completions/salt
 FISH_PLIST_FILES=	share/fish/completions/salt-call.fish \
 					share/fish/completions/salt-cp.fish \
 					share/fish/completions/salt-key.fish \
 					share/fish/completions/salt-master.fish \
 					share/fish/completions/salt-minion.fish \
 					share/fish/completions/salt-run.fish \
 					share/fish/completions/salt-syndic.fish \
 					share/fish/completions/salt.fish \
 					share/fish/completions/salt_common.fish
 ZSH_PLIST_FILES=	share/zsh/site-functions/_salt
 
 post-patch:
 .for file in conf/minion conf/master doc/man/salt-key.1 \
 	doc/man/salt-cp.1 doc/man/salt-minion.1 doc/man/salt-syndic.1 \
 	doc/man/salt-master.1 doc/man/salt-run.1 doc/man/salt.7 doc/man/salt.1 \
 	doc/man/salt-call.1 salt/modules/mysql.py salt/modules/tls.py salt/modules/postgres.py
 	@${REINPLACE_CMD} -e 's|/etc/salt|${ETCDIR}|' \
 		-e 's|/srv/salt|${ETCDIR}/states|' \
 		-e 's|/srv/pillar|${ETCDIR}/pillar|' ${WRKSRC}/${file}
 .endfor
 	@${REINPLACE_CMD} -e 's|yumpkg5|pkgng|' ${WRKSRC}/conf/minion
 	@${REINPLACE_CMD} -e 's|"/usr/bin/python3"|"${PYTHON_CMD}"|' ${WRKSRC}/salt/auth/pam.py
 
 do-install-BASH-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions/
 	${INSTALL_DATA} ${WRKSRC}/pkg/common/salt.bash \
 		${STAGEDIR}${PREFIX}/share/bash-completion/completions/salt
 
 do-install-FISH-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/completions/
 	${INSTALL_DATA} ${WRKSRC}/pkg/common/fish-completions/*.fish \
 		${STAGEDIR}${PREFIX}/share/fish/completions
 
 do-install-ZSH-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${WRKSRC}/pkg/common/salt.zsh \
 		${STAGEDIR}${PREFIX}/share/zsh/site-functions/_salt
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/conf/master ${STAGEDIR}${ETCDIR}/master.sample
 	${INSTALL_DATA} ${WRKSRC}/conf/minion ${STAGEDIR}${ETCDIR}/minion.sample
 
 .include <bsd.port.mk>
diff --git a/sysutils/py-salt/files/patch-salt_utils_process.py b/sysutils/py-salt/files/patch-salt_utils_process.py
new file mode 100644
index 000000000000..b12e5996c9a3
--- /dev/null
+++ b/sysutils/py-salt/files/patch-salt_utils_process.py
@@ -0,0 +1,14 @@
+--- salt/utils/process.py.orig	2024-07-29 07:51:58 UTC
++++ salt/utils/process.py
+@@ -59,7 +59,10 @@ def appendproctitle(name):
+         current = setproctitle.getproctitle()
+         if current.strip().endswith("MainProcess"):
+             current, _ = current.rsplit("MainProcess", 1)
+-        setproctitle.setproctitle(f"{current.rstrip()} {name}")
++        if len(current) > 0:
++            setproctitle.setproctitle(f"{current.rstrip()} {name}")
++        else:
++            setproctitle.setproctitle(name)
+
+
+ def daemonize(redirect_out=True):
diff --git a/sysutils/py-salt/files/salt_master.in b/sysutils/py-salt/files/salt_master.in
index 249c1d735e41..d8691747e322 100644
--- a/sysutils/py-salt/files/salt_master.in
+++ b/sysutils/py-salt/files/salt_master.in
@@ -1,41 +1,42 @@
 #!/bin/sh
 
 # Salt Master startup script
 #
 # PROVIDE: salt_master
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 
 # Add the following to /etc/rc.conf[.local] to enable this service
 #
 # salt_master_enable (bool):       Set to NO by default.
 #               Set it to YES to enable salt_master.
 # salt_master_paths (string):      Set to "/sbin:/bin:/usr/sbin:/usr/bin:%%PREFIX%%/bin:%%PREFIX%%/sbin" by default.
 #               Default $PATH for salt_master.
 # salt_master_eggcache (string):   Set to "/tmp" by default.
 #               Allows defining egg cache directory to fix runtime on diskless systems.
 #
 
 . /etc/rc.subr
 
 name=salt_master
 rcvar=salt_master_enable
 
 load_rc_config ${name}
 
 : ${salt_master_enable:=NO}
 : ${salt_master_paths=/sbin:/bin:/usr/sbin:/usr/bin:%%PREFIX%%/bin:%%PREFIX%%/sbin}
 : ${salt_master_configdir:=%%PREFIX%%/etc/salt}
 : ${salt_master_pidfile:=/var/run/salt-master.pid}
 : ${salt_master_eggcache=/tmp}
 
 command="%%PREFIX%%/bin/salt-master"
 command_interpreter="%%PYTHON_CMD%%"
 required_files=${salt_master_configdir}
 pidfile=${salt_master_pidfile}
 command_args="-c ${required_files} --pid-file=${pidfile} -d"
+procname="MainProcess"
 
 export PATH="${salt_master_paths}"
 export PYTHON_EGG_CACHE="${salt_master_eggcache}"
 
 run_rc_command "$1"
diff --git a/sysutils/py-salt/files/salt_minion.in b/sysutils/py-salt/files/salt_minion.in
index ff0a70f4c812..d7a125daad9d 100644
--- a/sysutils/py-salt/files/salt_minion.in
+++ b/sysutils/py-salt/files/salt_minion.in
@@ -1,41 +1,42 @@
 #!/bin/sh
 
 # Salt Minion startup script
 #
 # PROVIDE: salt_minion
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 
 # Add the following to /etc/rc.conf[.local] to enable this service
 #
 # salt_minion_enable (bool):       Set to NO by default.
 #               Set it to YES to enable salt_minion
 # salt_minion_paths (string):      Set to "/sbin:/bin:/usr/sbin:/usr/bin:%%PREFIX%%/bin:%%PREFIX%%/sbin" by default.
 #               Default $PATH for salt_minion
 # salt_minion_eggcache (string):   Set to "/tmp" by default.
 #               Allows defining egg cache directory to fix runtime on diskless systems.
 #
 
 . /etc/rc.subr
 
 name=salt_minion
 rcvar=salt_minion_enable
 
 load_rc_config ${name}
 
 : ${salt_minion_enable:=NO}
 : ${salt_minion_paths=/sbin:/bin:/usr/sbin:/usr/bin:%%PREFIX%%/bin:%%PREFIX%%/sbin}
 : ${salt_minion_configdir:=%%PREFIX%%/etc/salt}
 : ${salt_minion_pidfile:=/var/run/salt-minion.pid}
 : ${salt_minion_eggcache=/tmp}
 
 command="%%PREFIX%%/bin/salt-minion"
 command_interpreter="%%PYTHON_CMD%%"
 required_files=${salt_minion_configdir}
 pidfile=${salt_minion_pidfile}
 command_args="-c ${required_files} --pid-file=${pidfile} -d"
+procname="MultiMinionProcessManager"
 
 export PATH="${salt_minion_paths}"
 export PYTHON_EGG_CACHE="${salt_minion_eggcache}"
 
 run_rc_command "$1"