diff --git a/comms/ebusd/Makefile b/comms/ebusd/Makefile
index a96f465a8457..bb001ba1c09c 100644
--- a/comms/ebusd/Makefile
+++ b/comms/ebusd/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	ebusd
-PORTVERSION=	23.1
+PORTVERSION=	23.2
 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 616d92cd8ec1..efc416bc0441 100644
--- a/comms/ebusd/distinfo
+++ b/comms/ebusd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1685978814
-SHA256 (john30-ebusd-23.1_GH0.tar.gz) = 179743c967cc5e0fcbe8a884d57edec2dc387d7ff6a35298d4ee0e1781be7f6f
-SIZE (john30-ebusd-23.1_GH0.tar.gz) = 563842
+TIMESTAMP = 1689021891
+SHA256 (john30-ebusd-23.2_GH0.tar.gz) = 133ec8f44c446e31cc73b1777af5045a228ee20e0024b626c5fbb947f6a31952
+SIZE (john30-ebusd-23.2_GH0.tar.gz) = 568811
diff --git a/comms/ebusd/files/patch-configure.ac b/comms/ebusd/files/patch-configure.ac
index ffea9bbbceba..4df45b0b98d6 100644
--- a/comms/ebusd/files/patch-configure.ac
+++ b/comms/ebusd/files/patch-configure.ac
@@ -1,11 +1,11 @@
---- configure.ac.orig	2022-05-08 17:50:35 UTC
+--- configure.ac.orig	2023-07-08 13:54:20 UTC
 +++ configure.ac
-@@ -133,7 +133,7 @@ AM_COND_IF([CONTRIB], [AC_CONFIG_FILES([
+@@ -154,7 +154,7 @@ AM_COND_IF([KNX], [AC_CONFIG_FILES([
  	])])
  
  AC_DEFINE_UNQUOTED(PACKAGE_PIDFILE, LOCALSTATEDIR "/run/" PACKAGE ".pid", [The path and name of the PID file.])
 -AC_DEFINE_UNQUOTED(PACKAGE_LOGFILE, LOCALSTATEDIR "/log/" PACKAGE ".log", [The path and name of the log file.])
 +AC_DEFINE_UNQUOTED(PACKAGE_LOGFILE, LOCALSTATEDIR "/log/" PACKAGE "/" PACKAGE ".log", [The path and name of the log file.])
  AC_DEFINE(SCAN_VERSION, "[m4_esyscmd_s([sed -e 's#^\([0-9]*\.[0-9]*\).*#\1#' -e 's#\.\([0-9]\)$#0\1#' -e 's#\.##' VERSION])]", [The version of the package formatted for the scan result.])
- AC_DEFINE(PACKAGE_VERSION_MAJOR, "[m4_esyscmd_s([sed -e 's#^\([0-9]*\)\..*$#\1#' VERSION])]", [The major version of the package.])
- AC_DEFINE(PACKAGE_VERSION_MINOR, "[m4_esyscmd_s([sed -e 's#^.*\.\([0-9]*\)$#\1#' VERSION])]", [The minor version of the package.])
+ AC_DEFINE(PACKAGE_VERSION_MAJOR, [m4_esyscmd_s([sed -e 's#^\([0-9]*\)\..*$#\1#' VERSION])], [The major version of the package.])
+ AC_DEFINE(PACKAGE_VERSION_MINOR, [m4_esyscmd_s([sed -e 's#^.*\.\([0-9]*\)$#\1#' VERSION])], [The minor version of the package.])
diff --git a/comms/ebusd/files/patch-src_ebusd_main.cpp b/comms/ebusd/files/patch-src_ebusd_main.cpp
index c451ab1188d9..c4cf8070d4f3 100644
--- a/comms/ebusd/files/patch-src_ebusd_main.cpp
+++ b/comms/ebusd/files/patch-src_ebusd_main.cpp
@@ -1,12 +1,12 @@
---- src/ebusd/main.cpp.orig	2022-07-12 12:56:35 UTC
+--- src/ebusd/main.cpp.orig	2023-07-08 13:54:20 UTC
 +++ src/ebusd/main.cpp
-@@ -34,6 +34,9 @@
- #include "lib/utils/log.h"
+@@ -36,6 +36,9 @@
  #include "lib/utils/httpclient.h"
+ #include "ebusd/scan.h"
  
 +#ifdef __FreeBSD__
 +extern char **environ;
 +#endif
  
  /** the version string of the program. */
  const char *argp_program_version = "" PACKAGE_STRING "." REVISION "";
diff --git a/comms/ebusd/files/patch-src_tools_ebusctl.cpp b/comms/ebusd/files/patch-src_tools_ebusctl.cpp
index dcffdadcaf90..786c114c35fa 100644
--- a/comms/ebusd/files/patch-src_tools_ebusctl.cpp
+++ b/comms/ebusd/files/patch-src_tools_ebusctl.cpp
@@ -1,16 +1,16 @@
---- src/tools/ebusctl.cpp.orig	2022-07-12 13:01:34 UTC
+--- src/tools/ebusctl.cpp.orig	2023-07-08 13:54:20 UTC
 +++ src/tools/ebusctl.cpp
-@@ -147,7 +147,13 @@ string fetchData(ebusd::TCPSocket* socket, bool &liste
+@@ -153,7 +153,13 @@ string fetchData(ebusd::TCPSocket* socket, bool &liste
    time_t now;
    time(&now);
    time_t endTime = now + timeout;
 +
  #ifdef HAVE_PPOLL
 +
 +#ifndef POLLRDHUP
 +#  define POLLRDHUP 0
 +#endif
 +
    int nfds = 2;
    struct pollfd fds[nfds];