diff --git a/misc/openhab-addons/Makefile b/misc/openhab-addons/Makefile
index 8fa18c3f1c04..5c398c077120 100644
--- a/misc/openhab-addons/Makefile
+++ b/misc/openhab-addons/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	openhab-addons
-PORTVERSION=	4.3.5
+PORTVERSION=	4.3.6
 CATEGORIES=	misc java
 MASTER_SITES=	https://openhab.jfrog.io/artifactory/libs-release-local/org/openhab/distro/openhab-addons/${PORTVERSION}/
 DISTNAME=	openhab-addons-${PORTVERSION}
 EXTRACT_SUFX=	.kar
 
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	Addons for openhab
 WWW=		https://www.openhab.org/
 
 LICENSE=	EPL
 
 RUN_DEPENDS=	${LOCALBASE}/libexec/openhab/addons/README:misc/openhab
 
 USES=		cpe zip
 
 USERS=	openhab
 GROUPS=	openhab
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS="-v"
 EXTRACT_AFTER_ARGS="${EXTRACT_WRKDIR}"
 
 CPE_PRODUCT=	openhab
 
 PLIST_FILES=	libexec/openhab/addons/openhab-addons-${PORTVERSION}.kar
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/openhab
 	 ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/openhab/addons
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${DISTNAME}${EXTRACT_SUFX} ${STAGEDIR}${PREFIX}/libexec/openhab/addons/)
 
 .include <bsd.port.mk>
diff --git a/misc/openhab-addons/distinfo b/misc/openhab-addons/distinfo
index 1e3b10d81a8c..d564813f1926 100644
--- a/misc/openhab-addons/distinfo
+++ b/misc/openhab-addons/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1746445622
-SHA256 (openhab-addons-4.3.5.kar) = 965b8e64fca915c603b37a96d5fd89875a26d413f478cd7a705270542040e4bb
-SIZE (openhab-addons-4.3.5.kar) = 451904073
+TIMESTAMP = 1753530902
+SHA256 (openhab-addons-4.3.6.kar) = bfceeabeb4d8d712cb2a53091225e7b6de5829b01a2e842c2847c349b3be9d13
+SIZE (openhab-addons-4.3.6.kar) = 452457282
diff --git a/misc/openhab/Makefile b/misc/openhab/Makefile
index 92fb8a704fa3..127a3bff60ef 100644
--- a/misc/openhab/Makefile
+++ b/misc/openhab/Makefile
@@ -1,77 +1,77 @@
 PORTNAME=	openhab
-PORTVERSION=	4.3.5
-PORTREVISION=	1
+PORTVERSION=	4.3.6
+PORTREVISION=	0
 CATEGORIES=	misc java
 MASTER_SITES=	https://openhab.jfrog.io/artifactory/libs-release-local/org/openhab/distro/openhab/${PORTVERSION}/
 DISTNAME=	openhab-${PORTVERSION}
 
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	Vendor and technology agnostic open source smart-home software
 WWW=		https://www.openhab.org/
 
 LICENSE=	EPL
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
 USES=		cpe java zip
 JAVA_VERSION=	17
 USE_RC_SUBR=	openhab
 
 SUB_FILES=	pkg-message
 NO_WRKSUBDIR=	yes
 NO_ARCH=	yes
 
 USERS=	openhab
 GROUPS=	openhab
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 post-patch:
 	@${REINPLACE_CMD} -e "s:%%LOCALBASE%%:${LOCALBASE}:g" ${WRKSRC}/runtime/bin/setenv
 
 do-build:
 .for conf in services/runtime.cfg services/addons.cfg html/index.html transform/en.map transform/de.map
 	${MV} ${WRKSRC}/conf/${conf} ${WRKSRC}/conf/${conf}.sample
 .endfor
 	${RM} -r ${WRKSRC}/runtime/bin/contrib
 	${RM} ${WRKSRC}/*.ps1 ${WRKSRC}/*.bat ${WRKSRC}/runtime/bin/*.ps1 ${WRKSRC}/runtime/bin/*.bat \
 	    ${WRKSRC}/runtime/bin/*.psm1 \
 	    ${WRKSRC}/runtime/bin/setenv.bak \
 	    ${WRKSRC}/runtime/bin/setenv.orig
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/${PORTNAME}
 	${MKDIR} ${STAGEDIR}/var/log/${PORTNAME}
 	${MKDIR} ${STAGEDIR}/var/db/${PORTNAME}
 	${MKDIR} ${STAGEDIR}/var/db/${PORTNAME}/home
 	${MKDIR} ${STAGEDIR}/var/db/${PORTNAME}/persistence
 	${MKDIR} ${STAGEDIR}/var/db/${PORTNAME}/persistence/db4o
 	${MKDIR} ${STAGEDIR}/var/db/${PORTNAME}/persistence/rrd4j
 	${MKDIR} ${STAGEDIR}/var/db/${PORTNAME}/persistence/mapdb
 	${MKDIR} ${STAGEDIR}/var/db/${PORTNAME}/backups
 	${MKDIR} ${STAGEDIR}/var/db/${PORTNAME}/userdata
 	${MKDIR} ${STAGEDIR}/var/db/${PORTNAME}/userdata/etc
 	${MKDIR} ${STAGEDIR}/var/db/${PORTNAME}/userdata/etc/scripts
 	${MKDIR} ${STAGEDIR}/var/db/${PORTNAME}/userdata/tmp
 	${MKDIR} ${STAGEDIR}/var/run/${PORTNAME}
 	(cd ${WRKSRC}/conf && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/etc/${PORTNAME})
 	(cd ${WRKSRC} && ${COPYTREE_BIN} runtime ${STAGEDIR}${PREFIX}/libexec/${PORTNAME})
 	(cd ${WRKSRC} && ${COPYTREE_BIN} addons ${STAGEDIR}${PREFIX}/libexec/${PORTNAME})
 .for script in start.sh start_debug.sh
 	${INSTALL_SCRIPT} ${WRKSRC}/${script} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/
 .endfor
 	(cd ${WRKSRC}/userdata && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/${PORTNAME})
 
 gen-plist:
 	${FIND} ${STAGEDIR} -type f | sed -e "s:${STAGEDIR}${PREFIX}/::g ; s:${PORTVERSION}:%%PORTVERSION%%:g" | sort -u | grep libexec/ >pkg-plist.new
 	echo '@owner openhab' >>pkg-plist.new
 	echo '@group openhab' >>pkg-plist.new
 	${FIND} ${STAGEDIR}${DATADIR} -type f | sed -E -e "s:${STAGEDIR}${DATADIR}/(.*):@sample %%DATADIR%%/\\1 /var/db/openhab/userdata/\\1:g ; s:${PORTVERSION}:%%PORTVERSION%%:g" | sort -u >>pkg-plist.new
 	${FIND} ${STAGEDIR}${ETCDIR} -type d | sort -u | sed -e "s:${STAGEDIR}${ETCDIR}:@dir %%ETCDIR%%:g ; s:${PORTVERSION}:%%PORTVERSION%%:g"  >>pkg-plist.new
 	${FIND} ${STAGEDIR}${ETCDIR} -type f | sort -u | sed -E -e "s:${STAGEDIR}${ETCDIR}/:%%ETCDIR%%/:g ; s:${PORTVERSION}:%%PORTVERSION%%:g ; s:(.*.sample)$:@sample(openhab,openhab,640) \\1:" >>pkg-plist.new
 	${FIND} ${STAGEDIR}/var/db/${PORTNAME} -type d | sort -ru | sed -e "s:${STAGEDIR}:@dir :g" >>pkg-plist.new
 	echo "@dir /var/log/${PORTNAME}" >>pkg-plist.new
 	echo "@dir /var/run/${PORTNAME}" >>pkg-plist.new
 
 .include <bsd.port.mk>
diff --git a/misc/openhab/distinfo b/misc/openhab/distinfo
index 31ae2615c332..7f2309bccb09 100644
--- a/misc/openhab/distinfo
+++ b/misc/openhab/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1746445373
-SHA256 (openhab-4.3.5.zip) = 03da06ce2692b0637905e3068adc5df3bafeb2ef35c88e01bf9b8e31042a93d4
-SIZE (openhab-4.3.5.zip) = 111526701
+TIMESTAMP = 1753530653
+SHA256 (openhab-4.3.6.zip) = 153615ec8f81c22c804cf6c36c84fb759aa414bddb3a787b2bdc1faf385f05d7
+SIZE (openhab-4.3.6.zip) = 111525044