diff --git a/misc/openhab2-addons/Makefile b/misc/openhab2-addons/Makefile
index a5b1dc8d24c0..95f062fe4346 100644
--- a/misc/openhab2-addons/Makefile
+++ b/misc/openhab2-addons/Makefile
@@ -1,32 +1,35 @@
 PORTNAME=	openhab2-addons
 PORTVERSION=	2.5.12
 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 openhab2
 WWW=		https://www.openhab.org/
 
 LICENSE=	EPL
 
+DEPRECATED=	superseeded by misc/openhab-addons
+EXPIRATION_DATE=2025-12-31
+
 RUN_DEPENDS=	${LOCALBASE}/libexec/openhab2/addons/README:misc/openhab2
 
 USERS=	openhab
 GROUPS=	openhab
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS="-v"
 EXTRACT_AFTER_ARGS="${EXTRACT_WRKDIR}"
 
 PLIST_FILES=	libexec/openhab2/addons/openhab-addons-${PORTVERSION}.kar
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/openhab2
 	 ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/openhab2/addons
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${DISTNAME}${EXTRACT_SUFX} ${STAGEDIR}${PREFIX}/libexec/openhab2/addons/)
 
 .include <bsd.port.mk>
diff --git a/misc/openhab2/Makefile b/misc/openhab2/Makefile
index 21438f0a2bbf..b6b4d85cc277 100644
--- a/misc/openhab2/Makefile
+++ b/misc/openhab2/Makefile
@@ -1,80 +1,83 @@
 PORTNAME=	openhab2
 PORTVERSION=	2.5.12
 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
 
+DEPRECATED=	superseeded by misc/openhab
+EXPIRATION_DATE=2025-12-31
+
 USES=		cpe java zip
 JAVA_VERSION=	8
 USE_RC_SUBR=	openhab2
 
 SUB_FILES=	pkg-message update.freebsd
 NO_WRKSUBDIR=	yes
 NO_ARCH=	yes
 
 CPE_PRODUCT=	openhab
 
 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
 	${INSTALL_SCRIPT} ${WRKDIR}/update.freebsd ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/runtime/bin/
 	(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/openhab2/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>