diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile
index 5f495acdc170..79ec12951975 100644
--- a/x11/x3270/Makefile
+++ b/x11/x3270/Makefile
@@ -1,77 +1,78 @@
 PORTNAME?=	x3270
 PORTVERSION=	4.3
+PORTREVISION=	1
 CATEGORIES?=	x11 net
 MASTER_SITES=	http://x3270.bgp.nu/download/04.03/
-DISTFILES=	suite3270-${PORTVERSION}ga4-src.tgz
+DISTFILES=	suite3270-${PORTVERSION}ga8-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
 .if defined(WITHOUT_OPENSSL)
 CONFIGURE_ARGS+=	--disable-tls
 .else
 USES+=	ssl
 .endif
 
 CPE_VENDOR=	paul_mattes
 
 WRKSRC=		${WRKDIR}/suite3270-${PORTVERSION}
 
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES DBCS
 
 DBCS_DESC=	EBCDIC double-byte character set support
 
 .include <bsd.port.options.mk>
 
 .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
 CONFIGURE_ARGS+=	--with-fontdir=${FONTSDIR} \
 			--with-x=${LOCALBASE}
 SHEBANG_FILES=	x3270/x3270a.in
 PLIST_SUB+=	X3270=""
 .else
 CONFIGURE_ARGS+=	--disable-x3270 \
 			--disable-x3270if
 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-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)
 	${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
 
 	@(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 a7de616bb2ae..d27cd5a7af70 100644
--- a/x11/x3270/distinfo
+++ b/x11/x3270/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1707720825
-SHA256 (suite3270-4.3ga4-src.tgz) = 3b7bf11de9a05a5f203cb845bd8e7fb805c2a06ca606ccf8cdee4ff5c80caa4b
-SIZE (suite3270-4.3ga4-src.tgz) = 13163509
+TIMESTAMP = 1716439404
+SHA256 (suite3270-4.3ga8-src.tgz) = 81c0ba4447d97a7b483c40e11b39d4498bbc9af55fa4f78ccff064b3e378dc59
+SIZE (suite3270-4.3ga8-src.tgz) = 14603479
diff --git a/x11/x3270/files/patch-Common_c3270_keymap.c b/x11/x3270/files/patch-Common_c3270_keymap.c
index 3fd1dcafd314..d1c572e56723 100644
--- a/x11/x3270/files/patch-Common_c3270_keymap.c
+++ b/x11/x3270/files/patch-Common_c3270_keymap.c
@@ -1,47 +1,47 @@
---- Common/c3270/keymap.c.orig	2024-02-12 06:58:07 UTC
+--- Common/c3270/keymap.c.orig	2024-05-23 04:46:10 UTC
 +++ Common/c3270/keymap.c
 @@ -111,7 +111,7 @@ static int
   * Returns 0 if equal, nonzero if not.
   */
  static int
 -kcmp(k_t *a, k_t *b)
 +kcmp3270(k_t *a, k_t *b)
  {
      if (a->key && b->key && (a->key == b->key)) {
  	return 0;
 @@ -139,7 +139,7 @@ kvcmp(k_t *a, k_t *b, int len)
      	int i;
  
  	for (i = 0; i < len; i++) {
 -	    	if (kcmp(&a[i], &b[i]))
 +	    	if (kcmp3270(&a[i], &b[i]))
  			return 1;
  	}
  	return 0;
 @@ -673,7 +673,7 @@ lookup_key(int kcode, ucs4_t ucs4, int modifiers)
  	for (k = master_keymap; k != NULL; k = k->next) {
  	    if (IS_INACTIVE(k))
  		continue;
 -	    if (!kcmp(&code, &k->codes[0])) {
 +	    if (!kcmp3270(&code, &k->codes[0])) {
  		if (k->ncodes == 1) {
  		    shortest = k;
  		    break;
 @@ -693,7 +693,7 @@ lookup_key(int kcode, ucs4_t ucs4, int modifiers)
      }
  
      /* See if this character matches the next one we want. */
 -    if (!kcmp(&code, &current_match->codes[consumed])) {
 +    if (!kcmp3270(&code, &current_match->codes[consumed])) {
  	consumed++;
  	if (consumed == current_match->ncodes) {
  	    /* Final match. */
 @@ -721,7 +721,7 @@ lookup_key(int kcode, ucs4_t ucs4, int modifiers)
  	    continue;
  	}
  	if (k->ncodes > consumed && !codecmp(k, current_match, consumed) &&
 -		!kcmp(&k->codes[consumed], &code)) {
 +		!kcmp3270(&k->codes[consumed], &code)) {
  	    consumed++;
  	    if (k->ncodes == consumed) {
  		j = ambiguous(k, consumed);
diff --git a/x11/x3270/files/patch-pr3287_Makefile.obj.in b/x11/x3270/files/patch-pr3287_Makefile.obj.in
deleted file mode 100644
index f265a4b08571..000000000000
--- a/x11/x3270/files/patch-pr3287_Makefile.obj.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- pr3287/Makefile.obj.in.orig	2024-02-12 07:06:47 UTC
-+++ pr3287/Makefile.obj.in
-@@ -45,6 +45,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- LIBS = @LIBS@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_DATA = @INSTALL_DATA@
- 
- HOST = @host@
-@@ -70,7 +71,7 @@ install: pr3287 prtodir
- 	[ -d $(DESTDIR)$(BINDIR) ] || \
- 		mkdir -p $(DESTDIR)$(BINDIR)
- 	$(INSTALL_PROGRAM) pr3287 $(DESTDIR)$(BINDIR)/pr3287
--	$(INSTALL_PROGRAM) prtodir $(DESTDIR)$(BINDIR)/prtodir
-+	$(INSTALL_SCRIPT) prtodir $(DESTDIR)$(BINDIR)/prtodir
- 
- install.man: man
- 	[ -d $(DESTDIR)$(MANDIR)/man1 ] || \