diff --git a/sysutils/rundeck3/Makefile b/sysutils/rundeck3/Makefile
index 3573be10b1d0..a8af06bf9500 100644
--- a/sysutils/rundeck3/Makefile
+++ b/sysutils/rundeck3/Makefile
@@ -1,68 +1,67 @@
 PORTNAME=	rundeck
-DISTVERSION=	3.4.9
-DISTVERSIONSUFFIX=	20211221
+DISTVERSION=	3.4.10
+DISTVERSIONSUFFIX=	-20220118
 CATEGORIES=	sysutils java
 MASTER_SITES=	https://packagecloud.io/pagerduty/rundeck/packages/java/org.rundeck/${DISTNAME}.war/artifacts/${DISTNAME}.war/download?/
 PKGNAMESUFFIX=	3
-DISTNAME=	${PORTNAME}-${DISTVERSION}-${DISTVERSIONSUFFIX}
 EXTRACT_SUFX=	.war
 
 MAINTAINER=	daniel.tihanyi@tetragir.com
 COMMENT=	Web-console for dispatching commands and scripts to your nodes
 WWW=		https://rundeck.org
 
 LICENSE=	APACHE20
 
 USES=		cpe
 CPE_VENDOR=	pagerduty
 USE_JAVA=	yes
 JAVA_VERSION=	8 11
 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"
+.if ${RUNDECK_USER} == rundeck
 USERS=		rundeck
 .endif
-.if ${RUNDECK_GROUP} == "rundeck"
+.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/rundeck3/distinfo b/sysutils/rundeck3/distinfo
index 266a3349a77e..95661123ee53 100644
--- a/sysutils/rundeck3/distinfo
+++ b/sysutils/rundeck3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1640189772
-SHA256 (rundeck-3.4.9-20211221.war) = 1f05cf0e68c021cf36e59171b5e4ce7e299098ad837610070341f85188ac805c
-SIZE (rundeck-3.4.9-20211221.war) = 196646454
+TIMESTAMP = 1645191085
+SHA256 (rundeck-3.4.10-20220118.war) = 7726747a55e8a503726056aecc5505aefea435927f653ebd2fc619a9aa2f3720
+SIZE (rundeck-3.4.10-20220118.war) = 199264838
diff --git a/sysutils/rundeck3/files/rundeck.in b/sysutils/rundeck3/files/rundeck.in
index 60e78bcb13d9..a213a4c873d8 100644
--- a/sysutils/rundeck3/files/rundeck.in
+++ b/sysutils/rundeck3/files/rundeck.in
@@ -1,84 +1,84 @@
 #!/bin/sh
 
 # PROVIDE: rundeck
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 
 #
 # Configuration settings for rundeck in /etc/rc.conf:
 #
 # rundeck_enable (bool):
 #   Set to "NO" by default.
 #   Set it to "YES" to enable rundeck
 #
 # rundeck_args (str):
 #   Extra arguments passed to start command
 #
 # rundeck_home (str)
 #   Set to "%%RUNDECK_HOME%%" by default.
 #   Set the RUNDECK_HOME variable for rundeck process
 #
 # rundeck_java_home (str):
 #   Set to "%%JAVA_HOME%%" by default.
 #   Set the Java virtual machine to run rundeck
 #
 # rundeck_java_opts (str):
 #   Set to "" by default.
 #   Java VM args to use.
 #
 # rundeck_user (str):
 #   Set to "%%RUNDECK_USER%%" by default.
 #   User to run rundeck as.
 #
 # rundeck_group (str):
 #   Set to "%%RUNDECK_GROUP%%" by default.
 #   Group for data file ownership.
 #
 # rundeck_log_file (str):
 #   Set to "%%RUNDECK_LOG_FILE%%" by default.
 #   Log file location.
 #
 
 . /etc/rc.subr
 
 name="rundeck"
 rcvar=rundeck_enable
 
 load_rc_config "${name}"
 
 : ${rundeck_args="-b %%RUNDECK_HOME%%"}
 : ${rundeck_enable="NO"}
 : ${rundeck_home="%%RUNDECK_HOME%%"}
 : ${rundeck_java_home="%%JAVA_HOME%%"}
 : ${rundeck_user="%%RUNDECK_USER%%"}
 : ${rundeck_group="%%RUNDECK_GROUP%%"}
 : ${rundeck_log_file="%%RUNDECK_LOG_FILE%%"}
 
 pidfile="/var/run/rundeck/rundeck.pid"
 command="/usr/sbin/daemon"
 java_cmd="${rundeck_java_home}/bin/java"
 procname="${java_cmd}"
-command_args="-p ${pidfile} ${java_cmd} ${rundeck_java_opts} -jar %%DATADIR%%/rundeck.war ${rundeck_args} > ${rundeck_log_file} 2>&1"
+command_args="-p ${pidfile} -H -o ${rundeck_log_file} ${java_cmd} ${rundeck_java_opts} -jar %%DATADIR%%/rundeck.war ${rundeck_args}"
 required_files="${java_cmd}"
 
 start_precmd="rundeck_prestart"
 start_cmd="rundeck_start"
 
 rundeck_prestart() {
 	if [ ! -f "${rundeck_log_file}" ]; then
 		touch "${rundeck_log_file}"
 		chown "${rundeck_user}:${rundeck_group}" "${rundeck_log_file}"
 		chmod 640 "${rundeck_log_file}"
 	fi
 	if [ ! -d "/var/run/rundeck" ]; then
 		install -d -o "${rundeck_user}" -g "${rundeck_group}" -m 750 "/var/run/rundeck"
 	fi
 }
 
 rundeck_start()
 {
 	check_startmsgs && echo "Starting ${name}."
 	su -l ${rundeck_user} -c "exec ${command} ${command_args} ${rc_arg}"
 }
 
 run_rc_command "$1"