diff --git a/filesystems/moosefs-cgi/Makefile b/filesystems/moosefs-cgi/Makefile
index cba93ca6c02f..28875220e3c9 100644
--- a/filesystems/moosefs-cgi/Makefile
+++ b/filesystems/moosefs-cgi/Makefile
@@ -1,19 +1,19 @@
 PORTNAME=	moosefs-cgi
-DISTVERSION=	4.58.3
+DISTVERSION=	4.58.4
 CATEGORIES=	filesystems sysutils
 
 MAINTAINER=	freebsd@moosefs.com
 COMMENT=	Meta package to redirect old -cgi package to new -gui package
 WWW=		https://moosefs.com/
 
 LICENSE=	GPLv2
 
 DEPRECATED=		Renamed to moosefs-gui
 EXPIRATION_DATE=	2026-12-31
 
 RUN_DEPENDS=	moosefs-gui>0:filesystems/moosefs-gui
 USES=		metaport
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 .include <bsd.port.mk>
diff --git a/filesystems/moosefs-master/Makefile b/filesystems/moosefs-master/Makefile
index 6a94e7002e21..062e4ab02b8c 100644
--- a/filesystems/moosefs-master/Makefile
+++ b/filesystems/moosefs-master/Makefile
@@ -1,107 +1,106 @@
 PORTNAME=		moosefs
-DISTVERSION=		4.58.3
+DISTVERSION=		4.58.4
 DISTVERSIONSUFFIX=	-1
 PORTREVISION?=		0
 CATEGORIES=		filesystems sysutils
 MASTER_SITES=		http://repository.moosefs.com/src/
 PKGNAMESUFFIX?=		-master
 
 MAINTAINER=		freebsd@moosefs.com
 COMMENT?=		Fault-tolerant distributed filesystem
 WWW=			https://moosefs.com/
 
 LICENSE=		GPLv2
 
 USES=			python:build
 GNU_CONFIGURE=		yes
 WRKSRC=			${WRKDIR}/${PORTNAME}-${DISTVERSION}
 PLIST=			${.CURDIR}/pkg-plist
 DESCR=			${.CURDIR}/pkg-descr
 STRIP=
 
 MFS_COMPONENT?=		master
 MFS_USER=		mfs
 MFS_GROUP=		mfs
 MFS_WORKDIR=		/var
 
 USERS=			${MFS_USER}
 GROUPS=			${MFS_GROUP}
 
 CONFIGURE_ARGS+=	--localstatedir=${MFS_WORKDIR} \
 			--with-default-user=${MFS_USER} \
 			--with-default-group=${MFS_GROUP}
 
-CONFLICTS=		moosefs2-* \
-			moosefs3-*
+CONFLICTS=		moosefs3-*
 
 PLIST_SUB=		USER=${MFS_USER} \
 			GROUP=${MFS_GROUP}
 
 .if ${MFS_COMPONENT} == gui
 MFS_CGIDIR=		${PREFIX}/share/mfscgi
 USES=			python
 USE_RC_SUBR=		mfsgui
 SUB_FILES+=		pkg-message-gui
 PKGMESSAGE=		${WRKDIR}/pkg-message-gui
 PLIST_SUB+=		MFS_WORKDIR="${MFS_WORKDIR}"
 CONFIGURE_ARGS+=	--enable-mfscgi --enable-mfsgui \
 			--with-mfscgi-dir=${MFS_CGIDIR}
 RUN_DEPENDS=		moosefs-cli>0:filesystems/moosefs-cli
 CONFLICTS+=		moosefs-cgiserv
 .else
 CONFIGURE_ARGS+=	--disable-mfscgi --disable-mfsgui
 .endif
 
 .if ${MFS_COMPONENT} == chunkserver
 USE_RC_SUBR=		mfschunkserver
 SUB_FILES+=		pkg-message-chunkserver
 PKGMESSAGE=		${WRKDIR}/pkg-message-chunkserver
 PLIST_SUB+=		MFS_WORKDIR="${MFS_WORKDIR}"
 CONFIGURE_ARGS+=	--enable-mfschunkserver
 .else
 CONFIGURE_ARGS+=	--disable-mfschunkserver
 .endif
 
 .if ${MFS_COMPONENT} == cli
 USES=			python
 CONFIGURE_ARGS+=	--enable-mfscli
 NO_ARCH=		yes
 .else
 CONFIGURE_ARGS+=	--disable-mfscli
 .endif
 
 .if ${MFS_COMPONENT} == client
 USES=			compiler:c11 fuse:3 libtool pkgconfig
 USE_LDCONFIG=		yes
 CONFIGURE_ARGS+=	--enable-mfsmount
 .else
 CONFIGURE_ARGS+=	--disable-mfsmount
 .endif
 
 .if ${MFS_COMPONENT} == master
 USE_RC_SUBR=		mfsmaster
 PLIST_SUB+=		MFS_WORKDIR="${MFS_WORKDIR}"
 SUB_FILES+=		pkg-message-master
 PKGMESSAGE=		${WRKDIR}/pkg-message-master
 CONFIGURE_ARGS+=	--enable-mfsmaster
 .else
 CONFIGURE_ARGS+=	--disable-mfsmaster
 .endif
 
 .if ${MFS_COMPONENT} == metalogger
 USE_RC_SUBR=		mfsmetalogger
 SUB_FILES+=		pkg-message-metalogger
 PKGMESSAGE=		${WRKDIR}/pkg-message-metalogger
 PLIST_SUB+=		MFS_WORKDIR="${MFS_WORKDIR}"
 CONFIGURE_ARGS+=	--enable-mfsmetalogger
 .else
 CONFIGURE_ARGS+=	--disable-mfsmetalogger
 .endif
 
 .if ${MFS_COMPONENT} == netdump
 CONFIGURE_ARGS+=	--enable-mfsnetdump
 .else
 CONFIGURE_ARGS+=	--disable-mfsnetdump
 .endif
 
 .include <bsd.port.mk>
diff --git a/filesystems/moosefs-master/distinfo b/filesystems/moosefs-master/distinfo
index ef515c66653e..6eb5f54f7297 100644
--- a/filesystems/moosefs-master/distinfo
+++ b/filesystems/moosefs-master/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1770916355
-SHA256 (moosefs-4.58.3-1.tar.gz) = 883932d1bbe28d31258380b6053664c8a700e28ce8c6f85d017eb7d369ce1aaf
-SIZE (moosefs-4.58.3-1.tar.gz) = 1700352
+TIMESTAMP = 1773842939
+SHA256 (moosefs-4.58.4-1.tar.gz) = b0b4bbfc89c6d717a3083c71cea64b213785c926c35e25fc8f4652d0f3fa8164
+SIZE (moosefs-4.58.4-1.tar.gz) = 1702224