diff --git a/net-mgmt/unifi8/Makefile b/net-mgmt/unifi8/Makefile
index 6c7b5ea2a1b2..30eb6123bcca 100644
--- a/net-mgmt/unifi8/Makefile
+++ b/net-mgmt/unifi8/Makefile
@@ -1,99 +1,100 @@
 PORTNAME=	unifi8
 PORTVERSION=	8.6.9
+PORTREVISION?=	1
 CATEGORIES=	net-mgmt java
 MASTER_SITES=	http://dl.ubnt.com/unifi/%SUBDIR%/:unifi \
 		https://repo1.maven.org/maven2/%SUBDIR%/:jax
 MASTER_SITE_SUBDIR=	${PORTVERSION}/:unifi \
 			javax/activation/${_JAX_DISTNAME}/${_JAX_VERSION}/:jax
 DISTFILES=	unifi_sysvinit_all.deb:unifi \
 		${_JAX_DISTNAME}-${_JAX_VERSION}.jar:jax
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 EXTRACT_ONLY=	unifi_sysvinit_all.deb
 
 MAINTAINER=	otis@FreeBSD.org
 COMMENT=	UniFi Controller v8
 WWW=		https://help.ui.com/hc/en-us/categories/200320654-UniFi-Wireless
 
 RUN_DEPENDS=	snappyjava>0:archivers/snappy-java
 
 FLAVORS=	default externaldb
 FLAVOR?=	${FLAVORS:[1]}
 
 externaldb_PKGNAMESUFFIX=	-externaldb
 
 USES=		cpe
 
 CPE_VENDOR=	ui
 CPE_PRODUCT=	unifi_controller
 USE_JAVA=	yes
 JAVA_VERSION=	17
 JAVA_RUN=	jre
 USE_RC_SUBR=	unifi
 
 CONFLICTS_INSTALL=	unifi7
 
 EXTRACT_CMD=	${AR}
 EXTRACT_BEFORE_ARGS=	-p
 EXTRACT_AFTER_ARGS=	data.tar.xz | ${TAR} -xf -
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 SUB_LIST+=	GROUPS=${GROUPS} \
 		JAVA=${JAVA} \
 		JAVA_HOME=${JAVA_HOME} \
 		JAVASHAREDIR=${JAVASHAREDIR} \
 		USERS=${USERS}
 
 NO_WRKSUBDIR=	yes
 
 USERS=		unifi
 GROUPS=		unifi
 
 OPTIONS_DEFINE=	EXTERNALDB
 
 .if ${FLAVOR:U} == externaldb
 OPTIONS_DEFAULT+=	EXTERNALDB
 .endif
 
 EXTERNALDB_DESC=	Use external MongoDB server
 EXTERNALDB_VARS=	PKGMESSAGE+=${WRKSRC}/pkg-message.extdb \
 			SUB_FILES+=pkg-message.extdb
 EXTERNALDB_VARS_OFF=	RUN_DEPENDS+=mongodb60>0:databases/mongodb60
 
 _DIR_LIST=	conf data logs run work
 _JAX_DISTNAME=	javax.activation-api
 _JAX_VERSION=	1.2.0
 _SNAPPY_VERSION=	1.1.10.5
 
 post-extract:
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${_JAX_DISTNAME}-${_JAX_VERSION}.jar \
 		${WRKSRC}/usr/lib/unifi/lib/
 
 post-patch:
 	(cd ${WRKSRC}/usr/lib/unifi/lib/local && \
 		${RM} snappy-java-${_SNAPPY_VERSION}.jar && \
 		${LN} -f -s ${JAVAJARDIR}/snappy-java.jar snappy-java-${_SNAPPY_VERSION}.jar)
 	${RM} -r ${WRKSRC}/usr/lib/unifi/lib/native
 
 do-install:
 	${MKDIR} ${STAGEDIR}${JAVASHAREDIR}/unifi
 	(cd ${WRKSRC}/usr/lib/unifi && \
 		${COPYTREE_SHARE} \* ${STAGEDIR}${JAVASHAREDIR}/unifi/)
 # Create directories that will be writable by unifi
 .for i in data logs run work
 	${MKDIR} ${STAGEDIR}/${JAVASHAREDIR}/unifi/${i}
 .endfor
 
 do-install-EXTERNALDB-off:
 	${LN} -sf ${PREFIX}/bin/mongod ${STAGEDIR}${JAVASHAREDIR}/unifi/bin/mongod
 
 post-install:
 	@${FIND} -s ${STAGEDIR}${JAVASHAREDIR}/unifi -not -type d | \
 		${SORT} | ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
 .for dir in ${_DIR_LIST}
 	@${ECHO} "@dir(unifi,wheel,) ${JAVASHAREDIR}/unifi/${dir}" >> \
 		${TMPPLIST}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/unifi8/files/unifi.in b/net-mgmt/unifi8/files/unifi.in
index de9813e5f0f6..24c27141bebe 100644
--- a/net-mgmt/unifi8/files/unifi.in
+++ b/net-mgmt/unifi8/files/unifi.in
@@ -1,90 +1,93 @@
 #!/bin/sh
 #
 # Created by: Mark Felder <feld@FreeBSD.org>
 
 # PROVIDE: unifi
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 
 #
 # Add the following line to /etc/rc.conf to enable `unifi':
 #
 # unifi_enable="YES"
 #
 # Other configuration settings for unifi that can be set in /etc/rc.conf:
 #
 # unifi_user (str)
 #   This is the user that unifi runs as
 #   Set to %%USERS%% by default
 #
 # unifi_group (str)
 #   This is the group that unifi runs as
 #   Set to %%GROUPS%% by default
 #
 # unifi_chdir (str)
 #   This is the directory that unifi chdirs into before starting
 #   Set to %%JAVASHAREDIR%%/unifi by default
 #
 # unifi_java_home (str)
 #   The path to the base directory for the Java to use to run unifi
 #   Defaults to %%JAVA_HOME%%
 #
 # unifi_javaflags (str)
 #   Flags passed to Java to run unifi
 #   Set to "-Djava.awt.headless=true -Xmx1024M" by default
 #
 
 . /etc/rc.subr
 name=unifi
 
 rcvar=unifi_enable
 load_rc_config ${name}
 
 : ${unifi_enable:=NO}
 : ${unifi_user:=%%USERS%%}
 : ${unifi_group:=%%GROUPS%%}
 : ${unifi_chdir=%%JAVASHAREDIR%%/unifi}
 : ${unifi_java_home=%%JAVA_HOME%%}
-: ${unifi_javaflags="-Djava.awt.headless=true -Xmx1024M \
+: ${unifi_javaflags="-Djava.awt.headless=true \
 	-Djava.net.preferIPv4Stack=false \
+	-Dapple.awt.UIElement=true \
+	-Dfile.encoding=UTF-8 \
+	-Xmx1024M \
 	--add-opens java.base/java.lang=ALL-UNNAMED \
 	--add-opens java.base/java.time=ALL-UNNAMED \
 	--add-opens java.base/sun.security.util=ALL-UNNAMED \
 	--add-opens java.base/java.io=ALL-UNNAMED \
 	--add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED"}
 
 pidfile="/var/run/unifi/${name}.pid"
 procname=${unifi_java_home}/bin/java
 command=/usr/sbin/daemon
 command_args="-f -p ${pidfile} ${unifi_java_home}/bin/java ${unifi_javaflags} -jar lib/ace.jar start"
 start_precmd=start_precmd
 stop_precmd=stop_precmd
 stop_postcmd=stop_postcmd
 
 export CLASSPATH=$(echo ${unifi_chdir}/lib/*.jar | tr ' ' ':')
 
 start_precmd()
 {
 	if [ ! -e /var/run/unifi ] ; then
 		install -d -o %%USERS%% -g %%GROUPS%% /var/run/unifi;
 	fi
 }
 
 stop_precmd()
 {
 	if [ -r ${pidfile} ]; then
 		_UNIFIPID=$(check_pidfile ${pidfile} ${procname})
 		export _UNIFI_CHILDREN=$(pgrep -P ${_UNIFIPID})
 	fi
 }
 
 stop_postcmd()
 {
 	if ! [ -z ${_UNIFI_CHILDREN} ]; then
 		echo "Cleaning up leftover child processes."
 		kill $sig_stop ${_UNIFI_CHILDREN}
 		wait_for_pids ${_UNIFI_CHILDREN}
 	fi
 }
 
 run_rc_command "$1"