diff --git a/net-mgmt/lldpd/Makefile b/net-mgmt/lldpd/Makefile
index 74bc47a32d48..a40c3e58cb81 100644
--- a/net-mgmt/lldpd/Makefile
+++ b/net-mgmt/lldpd/Makefile
@@ -1,79 +1,79 @@
 PORTNAME=	lldpd
-DISTVERSION=	1.0.19
-PORTREVISION=	1
+DISTVERSION=	1.0.21
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/ \
 		http://media.luffy.cx/files/${PORTNAME}/
 
 MAINTAINER=	freebsd@simweb.ch
 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
 
 FLAVORS=	default tiny
 FLAVOR?=	${FLAVORS:[1]}
 tiny_PKGNAMESUFFIX=	-tiny
 
 USES=		cpe libtool pkgconfig
 CPE_VENDOR=	${PORTNAME}_project
 USE_LDCONFIG=	yes
 
 EXTRACT_AFTER_ARGS=	--exclude ${DISTNAME}/libevent \
 			--no-same-owner --no-same-permissions
 
 USE_RC_SUBR=	${PORTNAME}
 
 USERS=		_lldpd
 GROUPS= 	_lldpd
 
 GNU_CONFIGURE=	yes
 
 INSTALL_TARGET=	install-strip
 
 CONFIGURE_ARGS=	--disable-doxygen-doc \
 		--enable-hardening \
 		--enable-privsep \
 		--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
 
 .if ${FLAVOR} == tiny
 OPTIONS_UNSET=	${OPTIONS_DEFAULT}
 SUB_LIST+=	BASH="@comment " \
 		ZSH="@comment "
 .endif
 
 OPTIONS_DEFINE=		BASH DOCS LIBXML2 PIE PROPRIETARY READLINE SNMP ZSH
 OPTIONS_DEFAULT=	BASH LIBXML2 PROPRIETARY SNMP ZSH
 OPTIONS_SUB=		yes
 
 PIE_DESC=		Build PIE (position independant executables)
 PROPRIETARY_DESC=	Support proprietary protocols (CDP/EDP/FDP/SONMP)
 SNMP_DESC=		Enable SNMP sub-agent (AgentX)
 
 LIBXML2_USES=		gnome
 LIBXML2_USE=		GNOME=libxml2
 LIBXML2_CONFIGURE_WITH=	xml
 
 PIE_CONFIGURE_ENABLE=	pie
 
 PROPRIETARY_CONFIGURE_ENABLE=	cdp edp fdp sonmp
 
+READLINE_USES=			readline
 READLINE_CONFIGURE_WITH=	readline
 
-SNMP_USES=		ssl
 SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
+SNMP_LDFLAGS=		-Wl,--as-needed
 SNMP_CONFIGURE_WITH=	snmp
 
 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 a60fcf36a095..999da6a86c3c 100644
--- a/net-mgmt/lldpd/distinfo
+++ b/net-mgmt/lldpd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1736637102
-SHA256 (lldpd-1.0.19.tar.gz) = 4de17fe5137b4d44a7bd57f8dfc80cffe2c8bb3691b4ae3012b5a6ea20d79ee0
-SIZE (lldpd-1.0.19.tar.gz) = 1987102
+TIMESTAMP = 1773594026
+SHA256 (lldpd-1.0.21.tar.gz) = d0a96e601f2d2a168dd168d5fc46de0ca83f6ad04638ee104d175e15511e1874
+SIZE (lldpd-1.0.21.tar.gz) = 1999487
diff --git a/net-mgmt/lldpd/pkg-plist b/net-mgmt/lldpd/pkg-plist
index ea8b21422e51..3a9916facacb 100644
--- a/net-mgmt/lldpd/pkg-plist
+++ b/net-mgmt/lldpd/pkg-plist
@@ -1,23 +1,24 @@
 %%ETCDIR%%.d/README.conf
 include/lldp-const.h
 include/lldpctl.h
+include/lldpctl.hpp
 lib/liblldpctl.a
 lib/liblldpctl.so
 lib/liblldpctl.so.4
 lib/liblldpctl.so.4.10.0
 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