diff --git a/net/c3270/Makefile b/net/c3270/Makefile
index 25892d616426..0e1861381186 100644
--- a/net/c3270/Makefile
+++ b/net/c3270/Makefile
@@ -1,14 +1,14 @@
 PORTNAME=	c3270
 CATEGORIES=	net
 
 COMMENT=	curses-based remote login to IBM mainframes without x3270
 
-CONFLICTS_INSTALL=	x3270
+CPE_PRODUCT=	x3270
 
-C3270=	YES
+CONFLICTS_INSTALL=	x3270
 
 MASTERDIR=	${.CURDIR}/../../x11/x3270
 
-CPE_PRODUCT=	x3270
+C3270=		YES
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile
index 79ec12951975..896d7aeb780d 100644
--- a/x11/x3270/Makefile
+++ b/x11/x3270/Makefile
@@ -1,78 +1,74 @@
 PORTNAME?=	x3270
-PORTVERSION=	4.3
-PORTREVISION=	1
+PORTVERSION=	4.5
 CATEGORIES?=	x11 net
-MASTER_SITES=	http://x3270.bgp.nu/download/04.03/
-DISTFILES=	suite3270-${PORTVERSION}ga8-src.tgz
+MASTER_SITES=	http://x3270.bgp.nu/download/04.05/
+DISTFILES=	suite3270-${PORTVERSION}ga5-src.tgz
 
 MAINTAINER=	kbowling@FreeBSD.org
 COMMENT?=	3270 Terminal emulator
 WWW=		https://x3270.miraheze.org/wiki/Main_Page
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	tclsh:lang/tcl-wrapper
 LIB_DEPENDS=	libexpat.so:textproc/expat2
 
-USES=		cpe iconv gmake readline shebangfix tcl
-
-# x3270 includes c3270
-CONFLICTS_INSTALL?=	c3270
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-unix
+USES=			cpe gmake iconv python:build readline shebangfix tcl
+CPE_VENDOR=		paul_mattes
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS=		--enable-unix
 .if defined(WITHOUT_OPENSSL)
 CONFIGURE_ARGS+=	--disable-tls
 .else
-USES+=	ssl
+USES+=			ssl
 .endif
 
-CPE_VENDOR=	paul_mattes
+# x3270 includes c3270
+CONFLICTS_INSTALL?=	c3270
+
+SUB_FILES=	pkg-message
 
 WRKSRC=		${WRKDIR}/suite3270-${PORTVERSION}
 
 PORTEXAMPLES=	*
 
-OPTIONS_DEFINE=	DOCS EXAMPLES DBCS
-
-DBCS_DESC=	EBCDIC double-byte character set support
+OPTIONS_DEFINE=	DBCS DOCS EXAMPLES
+OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
+DBCS_DESC=		EBCDIC double-byte character set support
+DBCS_CONFIGURE_ENABLE=	dbcs
+DBCS_PLIST_SUB=		DBCS=""
 
-.if ! defined(C3270)
-BUILD_DEPENDS+=	bdftopcf:x11-fonts/bdftopcf \
-		mkfontscale:x11-fonts/mkfontscale
-USES+=	fonts xorg
-USE_XORG=	ice sm x11 xaw xext xmu xt xorgproto
+.if !defined(C3270)
+BUILD_DEPENDS+=		bdftopcf:x11-fonts/bdftopcf \
+			mkfontscale:x11-fonts/mkfontscale
+USES+=			fonts xorg
+USE_XORG=		ice sm x11 xaw xext xmu xorgproto xt
 CONFIGURE_ARGS+=	--with-fontdir=${FONTSDIR} \
 			--with-x=${LOCALBASE}
-SHEBANG_FILES=	x3270/x3270a.in
-PLIST_SUB+=	X3270=""
+SHEBANG_FILES=		x3270/x3270a.in
+PLIST_SUB+=		X3270=""
 .else
 CONFIGURE_ARGS+=	--disable-x3270 \
 			--disable-x3270if
-PLIST_SUB+=	X3270="@comment "
+PLIST_SUB+=		X3270="@comment "
 .endif
 
-# EBCDIC double-byte character set support is disabled by default
-.if ${PORT_OPTIONS:DBCS}
-CONFIGURE_ARGS+=	--enable-dbcs
-PLIST_SUB+=	DBCS=""
-.else
-PLIST_SUB+=	DBCS="@comment "
-.endif
+post-patch:
+	${REINPLACE_CMD} -e 's|#!/usr/bin/env python3|#!${PYTHON_CMD}|' \
+		${WRKSRC}/Common/mkversion.py
 
 post-install:
 .for m in b3270 c3270 pr3287 s3270 tcl3270
 	@(cd ${WRKSRC} ; ${INSTALL_MAN} ${m}/${m}.man ${STAGEDIR}${PREFIX}/share/man/man1/${m}.1)
 .endfor
-.if ! defined(C3270)
+.if !defined(C3270)
 	${INSTALL_MAN} ${WRKSRC}/x3270/x3270.man ${STAGEDIR}${PREFIX}/share/man/man1/x3270.1
 	${INSTALL_MAN} ${WRKSRC}/x3270if/x3270if.man ${STAGEDIR}${PREFIX}/share/man/man1/x3270if.1
 .endif
-	${INSTALL_MAN} ${WRKSRC}/c3270/ibm_hosts.man ${STAGEDIR}${PREFIX}/share/man/man5/ibm_hosts.5
+	${INSTALL_MAN} ${WRKSRC}/ibm_hosts/ibm_hosts.man ${STAGEDIR}${PREFIX}/share/man/man5/ibm_hosts.5
 
 	@(cd ${WRKSRC}/x3270/Examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 	@(cd ${WRKSRC}/x3270 && ${COPYTREE_SHARE} html ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git a/x11/x3270/distinfo b/x11/x3270/distinfo
index d27cd5a7af70..d9855bcdad9b 100644
--- a/x11/x3270/distinfo
+++ b/x11/x3270/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1716439404
-SHA256 (suite3270-4.3ga8-src.tgz) = 81c0ba4447d97a7b483c40e11b39d4498bbc9af55fa4f78ccff064b3e378dc59
-SIZE (suite3270-4.3ga8-src.tgz) = 14603479
+TIMESTAMP = 1767675742
+SHA256 (suite3270-4.5ga5-src.tgz) = 01576fa58598ccdd3d366febfaef61e3d1de93eb60a93f9ac6ba5faf84144c6f
+SIZE (suite3270-4.5ga5-src.tgz) = 14277116
diff --git a/x11/x3270/pkg-message b/x11/x3270/files/pkg-message.in
similarity index 67%
rename from x11/x3270/pkg-message
rename to x11/x3270/files/pkg-message.in
index 34018bbefe72..e08d944e980d 100644
--- a/x11/x3270/pkg-message
+++ b/x11/x3270/files/pkg-message.in
@@ -1,10 +1,10 @@
 [
 { type: install
   message: <<EOM
-If using x3270, You may wish to add  "/usr/local/share/fonts/x3270/" to your X11
+If using x3270, You may wish to add  "%%LOCALBASE%%/share/fonts/x3270/" to your X11
 FontPath. See "Using Fonts in Xorg" in the FreeBSD handbook.
 
 'x3270a' will automatically scale the interface for high DPI displays.
 EOM
 }
 ]