diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile
index 7c9e38290e16..e06151c93cdd 100644
--- a/sysutils/py-salt/Makefile
+++ b/sysutils/py-salt/Makefile
@@ -1,128 +1,127 @@
 PORTNAME=	salt
-PORTVERSION=	3006.7
-PORTREVISION=	2
+PORTVERSION=	3007.0
 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}yaml>0:devel/py-yaml@${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}
 
 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/distinfo b/sysutils/py-salt/distinfo
index bc2a237236ab..46f1e39327f5 100644
--- a/sysutils/py-salt/distinfo
+++ b/sysutils/py-salt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1708611593
-SHA256 (salt-3006.7.tar.gz) = ed92d21b84eb9d479f93ba89468453408117e0dc1010614214999e8d0c210afd
-SIZE (salt-3006.7.tar.gz) = 20562663
+TIMESTAMP = 1711901921
+SHA256 (salt-3007.0.tar.gz) = 41bf84e71fc655bf8a4b52eb440d0621ae961096a086d20e132e1512e2eddff8
+SIZE (salt-3007.0.tar.gz) = 20304228
diff --git a/sysutils/py-salt/files/patch-requirements_base.txt b/sysutils/py-salt/files/patch-requirements_base.txt
index bce755a71c50..39918449c502 100644
--- a/sysutils/py-salt/files/patch-requirements_base.txt
+++ b/sysutils/py-salt/files/patch-requirements_base.txt
@@ -1,8 +1,10 @@
---- requirements/base.txt.orig	2023-11-26 11:34:24 UTC
+--- requirements/base.txt.orig	2024-03-31 16:19:43 UTC
 +++ requirements/base.txt
-@@ -8,5 +8,3 @@ looseversion
- psutil>=5.0.0
- packaging>=21.3
- looseversion
--# We need contextvars for salt-ssh
+@@ -15,7 +15,6 @@ aiohttp>=3.9.0
+ 
+ # We need contextvars for salt-ssh.
+ # Even on python versions which ships with contextvars in the standard library!
 -contextvars
+ 
+ setproctitle>=1.2.3
+ timelib>=0.2.5
diff --git a/sysutils/py-salt/files/patch-salt_ext_tornado_iostream.py b/sysutils/py-salt/files/patch-salt_ext_tornado_iostream.py
deleted file mode 100644
index 4a163d249474..000000000000
--- a/sysutils/py-salt/files/patch-salt_ext_tornado_iostream.py
+++ /dev/null
@@ -1,10 +0,0 @@
---- salt/ext/tornado/iostream.py.orig	2023-05-16 11:50:28 UTC
-+++ salt/ext/tornado/iostream.py
-@@ -1116,6 +1116,7 @@ class IOStream(BaseIOStream):
-             future = self._connect_future = TracebackFuture()
-         try:
-             self.socket.connect(address)
-+            self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_SNDBUF, 524288)
-         except socket.error as e:
-             # In non-blocking mode we expect connect() to raise an
-             # exception with EINPROGRESS or EWOULDBLOCK.