diff --git a/comms/ser2net/Makefile b/comms/ser2net/Makefile
index 41cc273f6f9a..7053a8832483 100644
--- a/comms/ser2net/Makefile
+++ b/comms/ser2net/Makefile
@@ -1,49 +1,53 @@
 PORTNAME=	ser2net
-PORTVERSION=	3.5.1
-PORTREVISION=	1
+PORTVERSION=	4.6.4
 CATEGORIES=	comms net
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	rodrigo@FreeBSD.org
 COMMENT=	Allows to access serial ports over IP
 WWW=		https://www.sourceforge.net/projects/ser2net/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+LIB_DEPENDS=	libgensio.so:comms/gensio \
+		libyaml.so:textproc/libyaml
+
 USES=		libtool
 USE_RC_SUBR=	${PORTNAME}
 
 GNU_CONFIGURE=	yes
 
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
 PORTDOCS=	AUTHORS ChangeLog NEWS README
-PLIST_FILES=	sbin/${PORTNAME} etc/${PORTNAME}.conf.sample \
-		share/man/man8/${PORTNAME}.8.gz
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 .for i in ${PORTNAME}.c ${PORTNAME}.8
 	@${REINPLACE_CMD} -e \
 		's!/etc!${PREFIX}/etc!g' ${WRKSRC}/${i}
 .endfor
-.for i in ${PORTNAME}.conf
+.for i in ${PORTNAME}.yaml
 	@${REINPLACE_CMD} -e \
 		's!ttyS!cuad!g' ${WRKSRC}/${i}
 .endfor
-	@${REINPLACE_CMD} -e '/#include <values\.h>/d' \
-		${WRKSRC}/readconfig.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 \
 		${STAGEDIR}${PREFIX}/share/man/man8
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf \
-		${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/ && \
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.yaml \
+		${STAGEDIR}${PREFIX}/etc/${PORTNAME}/${PORTNAME}.yaml.sample
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.yaml.5 \
+		${STAGEDIR}${PREFIX}/share/man/man5
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S!^!${WRKSRC}/!} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/comms/ser2net/distinfo b/comms/ser2net/distinfo
index 5d2f6a416533..4867effe0e6a 100644
--- a/comms/ser2net/distinfo
+++ b/comms/ser2net/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1545042767
-SHA256 (ser2net-3.5.1.tar.gz) = 02f5dd0abbef5a17b80836b0de1ef0588e257106fb5e269b86822bfd001dc862
-SIZE (ser2net-3.5.1.tar.gz) = 437254
+TIMESTAMP = 1739622108
+SHA256 (ser2net-4.6.4.tar.gz) = 75864434c4f002fa3570daaffeb6f794354fca6d8b5814b8386977a3b1416be9
+SIZE (ser2net-4.6.4.tar.gz) = 477746
diff --git a/comms/ser2net/files/patch-devcfg.c b/comms/ser2net/files/patch-devcfg.c
deleted file mode 100644
index 75fc2b43536e..000000000000
--- a/comms/ser2net/files/patch-devcfg.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- devcfg.c.orig	2017-10-23 12:43:23 UTC
-+++ devcfg.c
-@@ -144,7 +144,7 @@ get_rate_from_baud_rate(int baud_rate, int *val, int c
- }
- 
- #ifdef USE_UUCP_LOCKING
--static char *uucp_lck_dir = "/var/lock/";
-+static char *uucp_lck_dir = "/var/spool/lock/";
- static char *dev_prefix = "/dev/";
- 
- static int
diff --git a/comms/ser2net/files/patch-port.h b/comms/ser2net/files/patch-port.h
new file mode 100644
index 000000000000..2029f1580c14
--- /dev/null
+++ b/comms/ser2net/files/patch-port.h
@@ -0,0 +1,10 @@
+--- ./port.h.orig	2025-02-16 11:47:28 UTC
++++ ./port.h
+@@ -32,6 +32,7 @@
+ #include <netdb.h>
+ #endif
+ 
++#include <netinet/in.h>
+ #include <gensio/gensio.h>
+ 
+ #include "gbuf.h"
diff --git a/comms/ser2net/files/ser2net.in b/comms/ser2net/files/ser2net.in
index 635f587020d3..6496db18ec22 100644
--- a/comms/ser2net/files/ser2net.in
+++ b/comms/ser2net/files/ser2net.in
@@ -1,25 +1,24 @@
 #!/bin/sh
 
 # PROVIDE: ser2net
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
 # KEYWORD: shutdown
 
 # Add the following lines to /etc/rc.conf to enable ser2net:
 # ser2net_enable="YES"
 # ser2net_flags="<set as needed>"
 
 . /etc/rc.subr
 
 name="ser2net"
 rcvar=ser2net_enable
 command="%%PREFIX%%/sbin/ser2net"
 
 load_rc_config $name
 : ${ser2net_enable="NO"}
 : ${ser2net_pidfile="/var/run/ser2net.pid"}
 
-start_cmd="/usr/sbin/daemon -p ${ser2net_pidfile} $command $rc_flags $command_args"
-stop_postcmd="rm -f /var/lock/subsys/ser2net"
+start_cmd="$command -P ${ser2net_pidfile} $ser2net_flags"
 
 run_rc_command "$1"
diff --git a/comms/ser2net/pkg-message b/comms/ser2net/pkg-message
new file mode 100644
index 000000000000..bcca155a583c
--- /dev/null
+++ b/comms/ser2net/pkg-message
@@ -0,0 +1,14 @@
+[
+{
+  type: upgrade
+  maximum_version: "4.6.4"
+  message: <<EOM
+Upgrading from before 4.6.4, old ser2net configuration is not supported anymore.
+You must convert the existing configuration into the new YAML format.
+See ser2net.yaml.sample and ser2net.yaml manpage for more details.
+
+Additional resources can be found on the following wiki page:
+https://wiki.freebsd.org/RodrigoOsorio/HowTo/Ser2Net
+EOM
+}
+]