diff --git a/net/tn5250/Makefile b/net/tn5250/Makefile
index be6a430f5bf7..cfc3b345cafa 100644
--- a/net/tn5250/Makefile
+++ b/net/tn5250/Makefile
@@ -1,29 +1,27 @@
 PORTNAME=	tn5250
-DISTVERSION=	0.17.6
-PORTREVISION=	1
+DISTVERSION=	0.18.0
 CATEGORIES=	net
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	5250 Telnet protocol and Terminal
 WWW=		https://github.com/tn5250/tn5250
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		libtool ncurses ssl
+USES=		libtool ncurses pathfix ssl
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--enable-os-dir=no --with-ssl=${OPENSSLBASE}
 
 INSTALL_TARGET=	install-strip
 
 post-patch:
+#	@${REINPLACE_CMD} -e \
+#		'/^SUBDIRS =/s|linux||g' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e \
-		'/^SUBDIRS =/s|linux||g' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e \
-		's|: install-data-local|:|g' ${WRKSRC}/freebsd/Makefile.in
+		's|: install-data-local|:|g' ${WRKSRC}/termcaps/freebsd/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/net/tn5250/distinfo b/net/tn5250/distinfo
index aec08da01d24..ab2a0adf0c77 100644
--- a/net/tn5250/distinfo
+++ b/net/tn5250/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1699721035
-SHA256 (tn5250-0.17.6.tar.gz) = f6383bc62360d858d55337296f373fb1797a2ba39dc931cd09d64a4a558e1641
-SIZE (tn5250-0.17.6.tar.gz) = 700576
+TIMESTAMP = 1775209464
+SHA256 (tn5250-0.18.0.tar.gz) = b936d39d5210fe447245cf08778655a48876ae2dfcb67373910163602128a919
+SIZE (tn5250-0.18.0.tar.gz) = 645380
diff --git a/net/tn5250/files/patch-Makefile.in b/net/tn5250/files/patch-Makefile.in
new file mode 100644
index 000000000000..7aa6791f870d
--- /dev/null
+++ b/net/tn5250/files/patch-Makefile.in
@@ -0,0 +1,39 @@
+--- Makefile.in.orig	2026-04-03 09:54:14 UTC
++++ Makefile.in
+@@ -142,11 +142,11 @@ am__v_GEN_0 = @echo "  GEN     " $@;
+ AM_V_GEN = $(am__v_GEN_@AM_V@)
+ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo "  GEN     " $@;
+-am__v_GEN_1 = 
++am__v_GEN_1 =
+ AM_V_at = $(am__v_at_@AM_V@)
+ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+ am__v_at_0 = @
+-am__v_at_1 = 
++am__v_at_1 =
+ SOURCES =
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+@@ -372,11 +372,10 @@ EXTRA_DIST = tn5250-48x48.xpm\
+         XTerm\
+         README.ssl\
+         config-cmake.h.in\
+-        termcaps/CMakeLists.txt\
+         CMakeLists.txt
+ 
+-SUBDIRS = lib5250 lp5250d curses doc termcaps/freebsd termcaps/linux termcaps/sun win32
+-DIST_SUBDIRS = lib5250 lp5250d curses doc termcaps/freebsd termcaps/linux termcaps/sun win32
++SUBDIRS = lib5250 lp5250d curses doc termcaps/freebsd win32
++DIST_SUBDIRS = lib5250 lp5250d curses doc termcaps/freebsd win32
+ bin_SCRIPTS = xt5250
+ pkgdata_DATA = XTerm
+ pkgconfigdir = $(libdir)/pkgconfig
+@@ -427,7 +426,7 @@ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config
+ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+ 	@rm -f stamp-h1
+ 	cd $(top_builddir) && $(SHELL) ./config.status config.h
+-$(srcdir)/config.h.in:  $(am__configure_deps) 
++$(srcdir)/config.h.in:  $(am__configure_deps)
+ 	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+ 	rm -f stamp-h1
+ 	touch $@
diff --git a/net/tn5250/pkg-plist b/net/tn5250/pkg-plist
index 02ff257605f0..5679b3209e2e 100644
--- a/net/tn5250/pkg-plist
+++ b/net/tn5250/pkg-plist
@@ -1,42 +1,43 @@
 bin/5250keys
 bin/lp5250d
 bin/scs2ascii
 bin/scs2pdf
 bin/scs2ps
 bin/tn5250
 bin/xt5250
 include/tn5250/buffer.h
 include/tn5250/codes5250.h
 include/tn5250/conf.h
 include/tn5250/cursesterm.h
 include/tn5250/dbuffer.h
 include/tn5250/debug.h
 include/tn5250/display.h
 include/tn5250/field.h
 include/tn5250/macro.h
 include/tn5250/menu.h
 include/tn5250/printsession.h
 include/tn5250/record.h
 include/tn5250/scrollbar.h
 include/tn5250/scs.h
 include/tn5250/session.h
 include/tn5250/stream.h
 include/tn5250/terminal.h
 include/tn5250/utility.h
 include/tn5250/window.h
 include/tn5250/wtd.h
 include/tn5250.h
 lib/lib5250.a
 lib/lib5250.so
 lib/lib5250.so.0
 lib/lib5250.so.0.0.0
+libdata/pkgconfig/tn5250.pc
 %%DATADIR%%/README
 %%DATADIR%%/XTerm
 %%DATADIR%%/sample.termcap
 %%DATADIR%%/us.5250.kbd
 share/man/man1/lp5250d.1.gz
 share/man/man1/scs2ascii.1.gz
 share/man/man1/scs2pdf.1.gz
 share/man/man1/scs2ps.1.gz
 share/man/man1/tn5250.1.gz
 share/man/man5/tn5250rc.5.gz