diff --git a/net-mgmt/lldpd/Makefile b/net-mgmt/lldpd/Makefile
index 27f8394569db..1ae18df1dd9e 100644
--- a/net-mgmt/lldpd/Makefile
+++ b/net-mgmt/lldpd/Makefile
@@ -1,82 +1,74 @@
 PORTNAME=	lldpd
-PORTVERSION=	1.0.14
-PORTREVISION=	1
+PORTVERSION=	1.0.18
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://media.luffy.cx/files/${PORTNAME}/
 
 MAINTAINER=	freebsd@simweb.ch
-COMMENT=	LLDP (802.1ab)/CDP/EDP/SONMP/FDP daemon and SNMP subagent
+COMMENT=	Link-Layer Discovery Protocol (LLDP 802.1ab) daemon
 WWW=		https://lldpd.github.io/
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libevent.so:devel/libevent
 
-USES=		cpe libtool
+FLAVORS=	default tiny
+tiny_PKGNAMESUFFIX=	-tiny
+
+USES=		cpe libtool pkgconfig
 CPE_VENDOR=	${PORTNAME}_project
 USE_CSTD=	gnu99
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	${PORTNAME}
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--disable-doxygen-doc \
 		--enable-hardening \
 		--enable-privsep \
-		--with-privsep-chroot=/var/empty \
+		--with-privsep-chroot=/var/run/lldpd \
 		--with-lldpd-ctl-socket=/var/run/lldpd.socket \
 		--with-lldpd-pid-file=/var/run/lldpd.pid \
 		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
 INSTALL_TARGET=	install-strip
 
 USERS=	_lldpd
 GROUPS=	_lldpd
 
-FLAVORS=        default tiny
-
-CONFLICTS_INSTALL=     ${FLAVORS:N${FLAVOR}:S/^/${PORTNAME}-/}
+CONFLICTS_INSTALL=	${FLAVORS:N${FLAVOR}:S/^/${PORTNAME}-/}
 
-OPTIONS_DEFINE=		BASH DOCS DTRACE JSON PIE PROPRIETARY READLINE SNMP XML ZSH
-OPTIONS_DEFAULT=	BASH JSON PROPRIETARY SNMP XML ZSH
+OPTIONS_DEFINE=		BASH DOCS DTRACE PIE PROPRIETARY READLINE SNMP XML ZSH
+OPTIONS_DEFAULT=	BASH PROPRIETARY SNMP XML ZSH
 # ld(1) fails to link probes: Relocations in generic ELF (EM: 0)
 OPTIONS_EXCLUDE_aarch64=	DTRACE
 # dt_modtext:opensolaris/lib/libdtrace/common/dt_link.c: arm not implemented
 OPTIONS_EXCLUDE_armv6=		DTRACE
 OPTIONS_EXCLUDE_armv7=		DTRACE
 OPTIONS_SUB=	yes
 
 .if ${FLAVOR:U} == tiny
-PKGNAMESUFFIX=  -tiny
-COMMENT=       LLDP (802.1ab) daemon
 OPTIONS_DEFAULT:=
 .endif
 
 DTRACE_DESC=		DTrace support (BROKEN)
-JSON_DESC=		JSON output support
 PIE_DESC=		Build PIE (position independant executables)
 PROPRIETARY_DESC=	Support proprietary protocols (CDP/EDP/FDP/SONMP)
-SNMP_DESC=		Enable the use of SNMP
+SNMP_DESC=		Enable SNMP sub-agent (AgentX)
 XML_DESC=		XML output support
 
 DTRACE_CONFIGURE_ENABLE=	dtrace
-JSON_LIB_DEPENDS=		libjansson.so:devel/jansson
-JSON_USES=			pkgconfig
-JSON_CONFIGURE_WITH=		json
 PIE_CONFIGURE_ENABLE=		pie
 PROPRIETARY_CONFIGURE_ENABLE=	cdp edp fdp sonmp
 READLINE_CONFIGURE_WITH=	readline
 SNMP_LIB_DEPENDS=		libnetsnmp.so:net-mgmt/net-snmp
 SNMP_USES=			ssl
 SNMP_CONFIGURE_WITH=		snmp
 XML_LIB_DEPENDS=		libxml2.so:textproc/libxml2
-# libedit needed in combination of READLINE and XML
-XML_USES=			libedit
 XML_CONFIGURE_WITH=		xml
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|/etc|${PREFIX}|g' ${WRKSRC}/src/daemon/lldpd.8.in
+post-install:
+	${MKDIR} ${STAGEDIR}/var/run/lldpd
 
 post-install-DOCS-on:
 	${INSTALL_DATA} ${FILESDIR}/README.bsd ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/lldpd/distinfo b/net-mgmt/lldpd/distinfo
index 4b0b01c8fbbc..8969b0b93699 100644
--- a/net-mgmt/lldpd/distinfo
+++ b/net-mgmt/lldpd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1653940567
-SHA256 (lldpd-1.0.14.tar.gz) = a74819214f116a5dbc407a3d490caa01ba401a249517ac826a374059c12d12e8
-SIZE (lldpd-1.0.14.tar.gz) = 1979314
+TIMESTAMP = 1715532062
+SHA256 (lldpd-1.0.18.tar.gz) = 4b320675d608901a4a0d4feff8f96bb846d4913d914b0cf75b7d0ae80490f2f7
+SIZE (lldpd-1.0.18.tar.gz) = 1988753
diff --git a/net-mgmt/lldpd/files/README.bsd b/net-mgmt/lldpd/files/README.bsd
index 069583854e20..9310f0b3275b 100644
--- a/net-mgmt/lldpd/files/README.bsd
+++ b/net-mgmt/lldpd/files/README.bsd
@@ -1,25 +1,18 @@
 # Permissions
 
 A normal user has to be member of the _lldpd group in order to run lldpcli.
 
 ## Notes on lldpd_flags
 
 Though lldpd_flags is not required to launch lldpd, remember that without 
 a specified "-I" option lldpd will be listening on _all_ physical interfaces.
 
 Short examples:
 
   * Listen only on em0 and enable CDP:
 	lldpd_flags="-I em0 -c"
   * Listen on all interfaces, except em0:
 	lldpd_flags="-I *,!em0"
 
-A whitelisted interface beats a blacklisted interface which beats a simple
+An allowlisted interface beats a blocklisted interface which beats a simple
 matched interface. See lldpd(8), which contains the complete documentation.
-
-## Compatibility
-
-This port should work equally well on both FreeBSD and DragonFly BSD, though
-the later might be a bit less regularly tested.
-
--- Mathieu Simon <freebsd@simweb.ch>, Tue, 06 Oct 2015 13:20:00 +02:00
diff --git a/net-mgmt/lldpd/pkg-plist b/net-mgmt/lldpd/pkg-plist
index 00af41872d22..8b80edcb75ef 100644
--- a/net-mgmt/lldpd/pkg-plist
+++ b/net-mgmt/lldpd/pkg-plist
@@ -1,22 +1,23 @@
 %%ETCDIR%%.d/README.conf
 include/lldp-const.h
 include/lldpctl.h
 lib/liblldpctl.a
 lib/liblldpctl.so
 lib/liblldpctl.so.4
 lib/liblldpctl.so.4.9.1
 libdata/pkgconfig/lldpctl.pc
 share/man/man8/lldpcli.8.gz
 share/man/man8/lldpctl.8.gz
 share/man/man8/lldpd.8.gz
 sbin/lldpcli
 sbin/lldpctl
 sbin/lldpd
 %%BASH%%share/bash-completion/completions/lldpcli
 %%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTE.md
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README.bsd
 %%PORTDOCS%%%%DOCSDIR%%/README.md
 %%ZSH%%share/zsh/site-functions/_lldpcli
+@dir(_llpd,_lldpd,750) /var/run/lldpd