diff --git a/comms/aprsd/Makefile b/comms/aprsd/Makefile
index bcd9254ef6bf..b12533eca532 100644
--- a/comms/aprsd/Makefile
+++ b/comms/aprsd/Makefile
@@ -1,56 +1,56 @@
 # Created by: db
 
 PORTNAME=	aprsd
 PORTVERSION=	2.2.515
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2.2.5-15
 DISTNAME=	aprsd-2.2.5-15
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Server daemon providing Internet access to APRS packet data
 
 LICENSE=	GPLv2
 
 BROKEN_FreeBSD_12_powerpc64=	fails to link on powerpc64 elfv1: httpserver.o:(.text+0x1074): undefined reference to `convertUpTime(int)'
 
 GNU_CONFIGURE=	yes
 SUB_FILES=	pkg-message pkg-deinstall
 USE_RC_SUBR=	aprsd
 
 USERS=	aprsd tnc
 GROUPS=	aprsd dialer tnc
 APRSD_RC_USER=	aprsd
 APRSD_RC_GROUP=	aprsd
 
-RC_SUB_LIST=	LOCALBASE=${LOCALBASE} APRSD_RC_USER=${APRSD_RC_USER} \
+SUB_LIST=	APRSD_RC_USER=${APRSD_RC_USER} \
 		APRSD_RC_GROUP=${APRSD_RC_GROUP}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%CONFPATH%%|${PREFIX}/etc/aprsd/|' \
 	    -e 's|%%LOGPATH%%|/var/log/aprsd/|' \
 		    ${WRKSRC}/src/aprsd.cpp
 	${REINPLACE_CMD} -e 's|%%LOGPATH%%|/var/log/aprsd/|' \
 	    ${WRKSRC}/src/utils.cpp
 
 pre-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/aprsd
 	${MKDIR} ${STAGEDIR}"/var/log/aprsd"
 
 post-install:
 	@cd ${WRKSRC}/admin
 .for	f in INIT.TNC RESTORE.TNC aprsd.conf welcome.txt user.deny
 	${INSTALL_DATA} ${WRKSRC}/admin/$f ${STAGEDIR}${PREFIX}/etc/aprsd/$f.samp
 .endfor
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for	f in chkaprsd udp_example
 	${INSTALL_DATA} ${WRKSRC}/admin/$f ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${CP} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/comms/aprsd/files/aprsd.in b/comms/aprsd/files/aprsd.in
index 393eefeb56af..f7cc47ab0c83 100644
--- a/comms/aprsd/files/aprsd.in
+++ b/comms/aprsd/files/aprsd.in
@@ -1,41 +1,41 @@
 #!/bin/sh
 
 # PROVIDE: aprsd
 # REQUIRE: NETWORKING
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf
 # aprsd_enable="YES"
 # aprsd_root="YES" or aprsd_root="NO"
 
 . /etc/rc.subr
 
 name=aprsd
 rcvar=aprsd_enable
 load_rc_config $name
 
 : ${aprsd_enable=NO}
 : ${aprsd_root=NO}
 : ${aprsd_user=%%APRSD_RC_USER%%}
 : ${aprsd_group=%%APRSD_RC_GROUP%%}
 
 command=%%LOCALBASE%%/bin/aprsd
 start_precmd=aprsd_pre
 stop_cmd=aprsd_stop
 pidfile=/var/run/aprsd.pid
 
 aprsd_pre()
 {
 	if [ ${aprsd_root} != "YES" ]; then
-		echo "Starting aprs server as user ${APRSD_RC_USER}:${APRSD_RC_GROUP}."
-		install -o ${APRSD_RC_USER} -g ${APRSD_RC_GROUP} /dev/null ${pidfile}
-		chown -R ${APRSD_RC_USER}:${APRSD_RC_GROUP} /var/log/aprsd
+		echo "Starting aprs server as user ${aprsd_user}:${aprsd_group}."
+		install -o ${aprsd_user} -g ${aprsd_group} /dev/null ${pidfile}
+		chown -R ${aprsd_user}:${aprsd_group} /var/log/aprsd
 	else   
 		echo "Starting aprs server as root."
 		install -o root -g wheel /dev/null ${pidfile}
                 chown -R root:wheel /var/log/aprsd
 	fi
 	return 0
 }
 
 run_rc_command "$1"