diff --git a/sysutils/rundeck/Makefile b/sysutils/rundeck/Makefile
index 3e7ee543b308..ee32a9505a00 100644
--- a/sysutils/rundeck/Makefile
+++ b/sysutils/rundeck/Makefile
@@ -1,64 +1,64 @@
 PORTNAME=	rundeck
-DISTVERSION=	4.17.3
-DISTVERSIONSUFFIX=	-20231113
+DISTVERSION=	5.8.0
+DISTVERSIONSUFFIX=	-20241205
 CATEGORIES=	sysutils java
 MASTER_SITES=	https://packagecloud.io/pagerduty/rundeck/packages/java/org.rundeck/${DISTNAME}.war/artifacts/${DISTNAME}.war/download?/
 EXTRACT_SUFX=	.war
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Web-console for dispatching commands and scripts to your nodes
 WWW=		https://rundeck.org
 
 LICENSE=	APACHE20
 
 USES=		cpe java
 CPE_VENDOR=	pagerduty
 USE_RC_SUBR=	rundeck
 
 CONFLICTS_INSTALL=	rundeck2
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 SUB_FILES=	${RUNDECK_LOG4J}
 SUB_LIST+=	JAVA_HOME=${JAVA_HOME} \
 		RUNDECK_CONFIG_DIR=${RUNDECK_CONFIG_DIR} \
 		RUNDECK_GROUP=${RUNDECK_GROUP} \
 		RUNDECK_HOME=${RUNDECK_HOME} \
 		RUNDECK_LOG4J=${RUNDECK_LOG4J} \
 		RUNDECK_LOG_FILE=${RUNDECK_LOG_FILE} \
 		RUNDECK_LOGDIR=${RUNDECK_LOGDIR} \
 		RUNDECK_USER=${RUNDECK_USER}
 
 RUNDECK_HOME=		${PREFIX}/rundeck
 RUNDECK_USER?=		rundeck
 RUNDECK_GROUP?=		rundeck
 RUNDECK_LOGDIR?=	/var/log/rundeck
 RUNDECK_LOG_FILE?=	${RUNDECK_LOGDIR}/rundeck.log
 RUNDECK_LOG4J=		log4j2.properties
 RUNDECK_CONFIG_DIR=	${RUNDECK_HOME}/server/config
 
 .if ${RUNDECK_USER} == rundeck
 USERS=		rundeck
 .endif
 .if ${RUNDECK_GROUP} == rundeck
 GROUPS=		rundeck
 .endif
 
 PLIST_SUB=	RUNDECK_GROUP=${RUNDECK_GROUP} \
 		RUNDECK_HOME=${RUNDECK_HOME} \
 		RUNDECK_LOGDIR=${RUNDECK_LOGDIR} \
 		RUNDECK_USER=${RUNDECK_USER}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${RUNDECK_HOME}/server/lib
 	${MKDIR} ${STAGEDIR}${RUNDECK_LOGDIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} \
 		${STAGEDIR}${DATADIR}/rundeck${EXTRACT_SUFX}
 
 post-install:
 	${MKDIR} ${STAGEDIR}${RUNDECK_CONFIG_DIR}
 	${INSTALL_DATA} \
 		${WRKDIR}/${RUNDECK_LOG4J} \
 		${STAGEDIR}${RUNDECK_CONFIG_DIR}/${RUNDECK_LOG4J}
 
 .include <bsd.port.mk>
diff --git a/sysutils/rundeck/distinfo b/sysutils/rundeck/distinfo
index 3b3f0ae65471..c61c5dd207d3 100644
--- a/sysutils/rundeck/distinfo
+++ b/sysutils/rundeck/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1700918553
-SHA256 (rundeck-4.17.3-20231113.war) = 4543da316ea27656ccc155bfc4eaf7d2c8b507d1d43ed82c72dbb191f4da991c
-SIZE (rundeck-4.17.3-20231113.war) = 246076413
+TIMESTAMP = 1736003337
+SHA256 (rundeck-5.8.0-20241205.war) = 7ea991633981b5e8998c29818f7d09e912c1ce0660c0b705cd428d148b07d8c4
+SIZE (rundeck-5.8.0-20241205.war) = 283983129