diff --git a/sysutils/tmux/Makefile b/sysutils/tmux/Makefile
--- a/sysutils/tmux/Makefile
+++ b/sysutils/tmux/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	tmux
-PORTVERSION=	3.5a
-PORTREVISION=	1
+PORTVERSION=	3.6
 CATEGORIES=	sysutils
 MASTER_SITES=	https://github.com/tmux/tmux/releases/download/${PORTVERSION}/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -9,12 +8,12 @@
 COMMENT=	Terminal Multiplexer
 WWW=		https://tmux.github.io/
 
-LICENSE=	ISCL GPLv2
+LICENSE=	GPLv2 ISCL
 LICENSE_COMB=	multi
-LICENSE_FILE_ISCL=	${WRKSRC}/COPYING
 LICENSE_FILE_GPLv2=	${WRKSRC_bash}/COPYING
-LICENSE_DISTFILES_ISCL=	${DISTNAME}${EXTRACT_SUFX}
+LICENSE_FILE_ISCL=	${WRKSRC}/COPYING
 LICENSE_DISTFILES_GPLv2=	${DISTFILE_bash}
+LICENSE_DISTFILES_ISCL=		${DISTNAME}${EXTRACT_SUFX}
 
 USES=		cpe pkgconfig
 
@@ -40,22 +39,22 @@
 
 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_USES=			localbase
 UTF8PROC_CONFIGURE_ENABLE=	utf8proc
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && (${OSVERSION} < 1401502 || \
-	${OSVERSION} >= 1500000 && ${OSVERSION} < 1500020)
-USES+=	ncurses:port
+.if ${OPSYS} == FreeBSD && (${OSVERSION} < 1401502 || ${OSVERSION} >= 1500000 && \
+	${OSVERSION} < 1500020)
+USES+=		ncurses:port
 .else
-USES+=	ncurses
+USES+=		ncurses
 .endif
 
 post-patch:
diff --git a/sysutils/tmux/distinfo b/sysutils/tmux/distinfo
--- a/sysutils/tmux/distinfo
+++ b/sysutils/tmux/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1728112504
-SHA256 (tmux-3.5a.tar.gz) = 16216bd0877170dfcc64157085ba9013610b12b082548c7c9542cc0103198951
-SIZE (tmux-3.5a.tar.gz) = 715619
+TIMESTAMP = 1764148608
+SHA256 (tmux-3.6.tar.gz) = 136db80cfbfba617a103401f52874e7c64927986b65b1b700350b6058ad69607
+SIZE (tmux-3.6.tar.gz) = 750145
 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-server-fn.c b/sysutils/tmux/files/patch-server-fn.c
new file mode 100644
--- /dev/null
+++ b/sysutils/tmux/files/patch-server-fn.c
@@ -0,0 +1,24 @@
+From bfa2f733351da5b2ee2674408eac744b067622fb Mon Sep 17 00:00:00 2001
+From: Nicholas Marriott <nicholas.marriott@gmail.com>
+Date: Wed, 26 Nov 2025 10:41:17 +0000
+Subject: [PATCH] Need signal.h for utempter, from Yasuhiro Kimura.
+
+---
+ server-fn.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git server-fn.c server-fn.c
+index 6ab7fa48..29802a60 100644
+--- server-fn.c
++++ server-fn.c
+@@ -20,6 +20,7 @@
+ #include <sys/wait.h>
+ #include <sys/uio.h>
+ 
++#include <signal.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <time.h>
+-- 
+2.52.0
+