diff --git a/comms/ebusd/Makefile b/comms/ebusd/Makefile
index be669b0a36e7..d2c607b04b86 100644
--- a/comms/ebusd/Makefile
+++ b/comms/ebusd/Makefile
@@ -1,44 +1,46 @@
 PORTNAME=	ebusd
 PORTVERSION=	25.1
 CATEGORIES=	comms
 
 MAINTAINER=	samm@FreeBSD.org
 COMMENT=	Daemon for communication with eBUS heating systems
 WWW=		https://github.com/john30/ebusd/wiki
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		autoreconf compiler:c++11-lang localbase:ldflags
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	john30
 
 USE_RC_SUBR=	ebusd
 
+GNU_CONFIGURE=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+
 USERS=		ebusd
 GROUPS=		ebusd
 
 LOGDIR=		/var/log/${PORTNAME}
 RUNDIR=		/var/run/${PORTNAME}
-CPPFLAGS+=	-I${LOCALBASE}/include
-GNU_CONFIGURE=	yes
 
-PLIST_SUB=	USER=${USERS} GROUP=${GROUPS} \
+PLIST_SUB=	GROUP=${GROUPS} \
 		LOGDIR=${LOGDIR} \
-		RUNDIR=${RUNDIR}
+		RUNDIR=${RUNDIR} \
+		USER=${USERS}
 
-OPTIONS_DEFINE=	MQTT
-OPTIONS_DEFAULT=MQTT
-OPTIONS_SUB=	yes
-MQTT_DESC=	MQTT protocol support
+OPTIONS_DEFINE=		MQTT
+OPTIONS_DEFAULT=	MQTT
+OPTIONS_SUB=		yes
+MQTT_DESC=		MQTT protocol support
 
-MQTT_CONFIGURE_WITH=	mqtt
 MQTT_LIB_DEPENDS=	libmosquitto.so:net/mosquitto
+MQTT_CONFIGURE_WITH=	mqtt
 MQTT_VARS=		LIBS+=-lmosquitto
 
 post-install:
 	${MKDIR} ${STAGEDIR}${LOGDIR}
 	${MKDIR} ${STAGEDIR}${RUNDIR}
 
 .include <bsd.port.mk>