diff --git a/comms/ebusd/Makefile b/comms/ebusd/Makefile
index 5856dc7527b0..a96f465a8457 100644
--- a/comms/ebusd/Makefile
+++ b/comms/ebusd/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	ebusd
-PORTVERSION=	22.3
-DISTVERSIONPREFIX=	v
+PORTVERSION=	23.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
 
 LIB_DEPENDS=	libargp.so:devel/argp-standalone
 
 USES=		autoreconf compiler:c++11-lang localbase:ldflags
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	john30
 
 USE_RC_SUBR=	ebusd
 
 USERS=		ebusd
 GROUPS=		ebusd
 
 LOGDIR=		/var/log/${PORTNAME}
 RUNDIR=		/var/run/${PORTNAME}
 CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ebusfeed
 
 PLIST_SUB=	USER=${USERS} GROUP=${GROUPS} \
 		LOGDIR=${LOGDIR} \
 		RUNDIR=${RUNDIR}
 
 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_VARS=		LIBS+=-lmosquitto
 
 post-install:
 	${MKDIR} ${STAGEDIR}${LOGDIR}
 	${MKDIR} ${STAGEDIR}${RUNDIR}
 
 .include <bsd.port.mk>
diff --git a/comms/ebusd/distinfo b/comms/ebusd/distinfo
index 387b6d7f353f..616d92cd8ec1 100644
--- a/comms/ebusd/distinfo
+++ b/comms/ebusd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1657630258
-SHA256 (john30-ebusd-v22.3_GH0.tar.gz) = 7b9b8297c76670617bd25d3bb66f4a887188b8d9a4980a27b5e2f172448e0134
-SIZE (john30-ebusd-v22.3_GH0.tar.gz) = 532334
+TIMESTAMP = 1685978814
+SHA256 (john30-ebusd-23.1_GH0.tar.gz) = 179743c967cc5e0fcbe8a884d57edec2dc387d7ff6a35298d4ee0e1781be7f6f
+SIZE (john30-ebusd-23.1_GH0.tar.gz) = 563842
diff --git a/comms/ebusd/pkg-plist b/comms/ebusd/pkg-plist
index 9fc25e0a4fc6..56427226a48d 100644
--- a/comms/ebusd/pkg-plist
+++ b/comms/ebusd/pkg-plist
@@ -1,7 +1,10 @@
 bin/ebusd
 bin/ebusctl
 bin/ebusfeed
 bin/ebuspicloader
+%%MQTT%%%%ETCDIR%%/mqtt-hassio.cfg
+%%MQTT%%%%ETCDIR%%/mqtt-integration.cfg
+%%ETCDIR%%/knx.cfg
 @dir(%%USER%%,%%GROUP%%,750) %%RUNDIR%%
 @dir(%%USER%%,%%GROUP%%,750) %%LOGDIR%%
 @dir %%ETCDIR%%