diff --git a/sysutils/tmux/Makefile b/sysutils/tmux/Makefile
index 4ae211a218d3..9592aef810b5 100644
--- a/sysutils/tmux/Makefile
+++ b/sysutils/tmux/Makefile
@@ -1,73 +1,72 @@
 PORTNAME=	tmux
-PORTVERSION=	3.3a
-PORTREVISION=	3
+PORTVERSION=	3.5a
 CATEGORIES=	sysutils
 MASTER_SITES=	https://github.com/tmux/tmux/releases/download/${PORTVERSION}/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Terminal Multiplexer
 WWW=		https://tmux.github.io/
 
 LICENSE=	ISCL GPLv2
 LICENSE_COMB=	multi
 LICENSE_FILE_ISCL=	${WRKSRC}/COPYING
 LICENSE_FILE_GPLv2=	${WRKSRC_bash}/COPYING
 LICENSE_DISTFILES_ISCL=	${DISTNAME}${EXTRACT_SUFX}
 LICENSE_DISTFILES_GPLv2=	${DISTFILE_bash}
 
 USES=		cpe ncurses:port pkgconfig
 
 CPE_VENDOR=	tmux_project
 
 USE_GITHUB=	nodefault
-GH_TUPLE=	imomaliev:tmux-bash-completion:f5d5323:bash
+GH_TUPLE=	imomaliev:tmux-bash-completion:8da7f79:bash
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--enable-utempter \
 		--sysconfdir=${PREFIX}/etc
 
 CONFLICTS_INSTALL=	tmux23
 
 PLIST_FILES=	bin/tmux \
 		etc/bash_completion.d/tmux \
 		share/man/man1/tmux.1.gz
 
 PORTDOCS=	CHANGES README
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES LIBEVENT_STATIC UTF8PROC
 
 LIBEVENT_STATIC_DESC=	Build with static libevent
 UTF8PROC_DESC=		Build with utf8proc support
 UTF8PROC_USES=		localbase
 
 LIBEVENT_STATIC_BUILD_DEPENDS=		${LOCALBASE}/lib/libevent.a:devel/libevent
 LIBEVENT_STATIC_LIB_DEPENDS_OFF=	libevent.so:devel/libevent
 LIBEVENT_STATIC_VARS=			LESTATIC=${LOCALBASE}/lib/libevent.a
 
 UTF8PROC_LIB_DEPENDS=		libutf8proc.so:textproc/utf8proc
 UTF8PROC_CONFIGURE_ENABLE=	utf8proc
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/tmux.conf|${PREFIX}/etc/tmux.conf|g' ${WRKSRC}/CHANGES \
 		${WRKSRC}/tmux.h
 
 post-configure-LIBEVENT_STATIC-on:
 	${REINPLACE_CMD} -e '/LIBS/s|-levent[^[:blank:]]*|${LESTATIC}|' \
 		${WRKSRC}/${MAKEFILE}
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${INSTALL_DATA} ${WRKSRC_bash}/completions/tmux ${STAGEDIR}${PREFIX}/etc/bash_completion.d/tmux
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/example* ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/tmux/distinfo b/sysutils/tmux/distinfo
index 37cd29fb5bdc..f3395690b524 100644
--- a/sysutils/tmux/distinfo
+++ b/sysutils/tmux/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1657892731
-SHA256 (tmux-3.3a.tar.gz) = e4fd347843bd0772c4f48d6dde625b0b109b7a380ff15db21e97c11a4dcdf93f
-SIZE (tmux-3.3a.tar.gz) = 677448
-SHA256 (imomaliev-tmux-bash-completion-f5d5323_GH0.tar.gz) = 4e4f791c446e3cab1a02d39a30fbfd4cec6c7e3119365860a04c9de205eaa626
-SIZE (imomaliev-tmux-bash-completion-f5d5323_GH0.tar.gz) = 8726
+TIMESTAMP = 1728112504
+SHA256 (tmux-3.5a.tar.gz) = 16216bd0877170dfcc64157085ba9013610b12b082548c7c9542cc0103198951
+SIZE (tmux-3.5a.tar.gz) = 715619
+SHA256 (imomaliev-tmux-bash-completion-8da7f79_GH0.tar.gz) = 2ba28d9a0f0b419184229f234fcb20ed6d6f456b4ef592e4cd2eec79142e7502
+SIZE (imomaliev-tmux-bash-completion-8da7f79_GH0.tar.gz) = 9438
diff --git a/sysutils/tmux/files/patch-e86752820993a0 b/sysutils/tmux/files/patch-e86752820993a0
deleted file mode 100644
index e487fb42fada..000000000000
--- a/sysutils/tmux/files/patch-e86752820993a0
+++ /dev/null
@@ -1,54 +0,0 @@
-Index: control.c
-===================================================================
---- control.c.orig	2022-04-25 08:25:13 UTC
-+++ control.c
-@@ -775,6 +775,9 @@ control_start(struct client *c)
- 
- 	cs->read_event = bufferevent_new(c->fd, control_read_callback,
- 	    control_write_callback, control_error_callback, c);
-+	if (cs->read_event == NULL)
-+		fatalx("out of memory");
-+
- 	bufferevent_enable(cs->read_event, EV_READ);
- 
- 	if (c->flags & CLIENT_CONTROLCONTROL)
-@@ -782,6 +785,8 @@ control_start(struct client *c)
- 	else {
- 		cs->write_event = bufferevent_new(c->out_fd, NULL,
- 		    control_write_callback, control_error_callback, c);
-+		if (cs->write_event == NULL)
-+			fatalx("out of memory");
- 	}
- 	bufferevent_setwatermark(cs->write_event, EV_WRITE, CONTROL_BUFFER_LOW,
- 	    0);
---- file.c.orig	2022-04-25 08:25:13 UTC
-+++ file.c
-@@ -585,6 +585,8 @@ file_write_open(struct client_files *files, struct tmu
- 
- 	cf->event = bufferevent_new(cf->fd, NULL, file_write_callback,
- 	    file_write_error_callback, cf);
-+	if (cf->event == NULL)
-+		fatalx("out of memory");
- 	bufferevent_enable(cf->event, EV_WRITE);
- 	goto reply;
- 
-@@ -744,6 +746,8 @@ file_read_open(struct client_files *files, struct tmux
- 
- 	cf->event = bufferevent_new(cf->fd, file_read_callback, NULL,
- 	    file_read_error_callback, cf);
-+	if (cf->event == NULL)
-+		fatalx("out of memory");
- 	bufferevent_enable(cf->event, EV_READ);
- 	return;
- 
---- window.c.orig	2022-04-25 08:25:14 UTC
-+++ window.c
-@@ -1042,6 +1042,8 @@ window_pane_set_event(struct window_pane *wp)
- 
- 	wp->event = bufferevent_new(wp->fd, window_pane_read_callback,
- 	    NULL, window_pane_error_callback, wp);
-+	if (wp->event == NULL)
-+		fatalx("out of memory");
- 	wp->ictx = input_init(wp, wp->event, &wp->palette);
- 
- 	bufferevent_enable(wp->event, EV_READ|EV_WRITE);
diff --git a/sysutils/tmux/files/patch-to-fix-crash-due-to-change-to-ncurses.patch b/sysutils/tmux/files/patch-to-fix-crash-due-to-change-to-ncurses.patch
deleted file mode 100644
index 00922273763c..000000000000
--- a/sysutils/tmux/files/patch-to-fix-crash-due-to-change-to-ncurses.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git tty-term.c tty-term.c
-index fdf0c4fa..873e1ce2 100644
---- tty-term.c
-+++ tty-term.c
-@@ -762,33 +762,53 @@ tty_term_string(struct tty_term *term, enum tty_code_code code)
- const char *
- tty_term_string1(struct tty_term *term, enum tty_code_code code, int a)
- {
--	return (tparm((char *) tty_term_string(term, code), a, 0, 0, 0, 0, 0, 0, 0, 0));
-+	const char	*x = tty_term_string(term, code), *s;
-+	s = tiparm_s(1, 0, x, a);
-+	if (s == NULL)
-+		fatalx("could not expand %s", tty_term_codes[code].name);
-+	return (s);
- }
- 
- const char *
- tty_term_string2(struct tty_term *term, enum tty_code_code code, int a, int b)
- {
--	return (tparm((char *) tty_term_string(term, code), a, b, 0, 0, 0, 0, 0, 0, 0));
-+	const char	*x = tty_term_string(term, code), *s;
-+	s = tiparm_s(2, 0, x, a, b);
-+	if (s == NULL)
-+		fatalx("could not expand %s", tty_term_codes[code].name);
-+	return (s);
- }
- 
- const char *
- tty_term_string3(struct tty_term *term, enum tty_code_code code, int a, int b,
-     int c)
- {
--	return (tparm((char *) tty_term_string(term, code), a, b, c, 0, 0, 0, 0, 0, 0));
-+	const char	*x = tty_term_string(term, code), *s;
-+	s = tiparm_s(3, 0, x, a, b, c);
-+	if (s == NULL)
-+		fatalx("could not expand %s", tty_term_codes[code].name);
-+	return (s);
- }
- 
- const char *
- tty_term_ptr1(struct tty_term *term, enum tty_code_code code, const void *a)
- {
--	return (tparm((char *) tty_term_string(term, code), (long)a, 0, 0, 0, 0, 0, 0, 0, 0));
-+	const char	*x = tty_term_string(term, code), *s;
-+	s = tiparm_s(1, 1, x, a);
-+	if (s == NULL)
-+		fatalx("could not expand %s", tty_term_codes[code].name);
-+	return (s);
- }
- 
- const char *
- tty_term_ptr2(struct tty_term *term, enum tty_code_code code, const void *a,
-     const void *b)
- {
--	return (tparm((char *) tty_term_string(term, code), (long)a, (long)b, 0, 0, 0, 0, 0, 0, 0));
-+	const char	*x = tty_term_string(term, code), *s;
-+	s = tiparm_s(2, 3, x, a, b);
-+	if (s == NULL)
-+		fatalx("could not expand %s", tty_term_codes[code].name);
-+	return (s);
- }
- 
- int