diff --git a/sysutils/tmux/Makefile b/sysutils/tmux/Makefile
index df1538387a6c..e55fb335d947 100644
--- a/sysutils/tmux/Makefile
+++ b/sysutils/tmux/Makefile
@@ -1,81 +1,66 @@
 PORTNAME=	tmux
-PORTVERSION=	3.6
-PORTREVISION=	1
+PORTVERSION=	3.6a
 CATEGORIES=	sysutils
-MASTER_SITES=	https://github.com/tmux/tmux/releases/download/${PORTVERSION}/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+MASTER_SITES=	https://github.com/tmux/tmux/releases/download/${DISTVERSION}/
 
 MAINTAINER=	jrm@FreeBSD.org
 COMMENT=	Terminal Multiplexer
 WWW=		https://tmux.github.io/
 
-LICENSE=	GPLv2 ISCL
-LICENSE_COMB=	multi
-LICENSE_FILE_GPLv2=	${WRKSRC_bash}/COPYING
-LICENSE_FILE_ISCL=	${WRKSRC}/COPYING
-LICENSE_DISTFILES_GPLv2=	${DISTFILE_bash}
-LICENSE_DISTFILES_ISCL=		${DISTNAME}${EXTRACT_SUFX}
+LICENSE=	ISCL
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		cpe pkgconfig
-
 CPE_VENDOR=	tmux_project
 
-USE_GITHUB=	nodefault
-GH_TUPLE=	imomaliev:tmux-bash-completion:8da7f79:bash
-
 GNU_CONFIGURE=	yes
 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
 
 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
+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
 .else
 USES+=		ncurses
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/etc/tmux.conf|${PREFIX}/etc/tmux.conf|g' ${WRKSRC}/CHANGES \
-		${WRKSRC}/tmux.h
+	@${REINPLACE_CMD} -e 's|/etc/tmux.conf|${PREFIX}/etc/tmux.conf|g' \
+		${PATCH_WRKSRC}/CHANGES ${PATCH_WRKSRC}/tmux.h
+	@${REINPLACE_CMD} -e 's|-O2||g' ${PATCH_WRKSRC}/Makefile.in
 
 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.post.mk>
diff --git a/sysutils/tmux/distinfo b/sysutils/tmux/distinfo
index 496dd8acffdb..eb280eb481bb 100644
--- a/sysutils/tmux/distinfo
+++ b/sysutils/tmux/distinfo
@@ -1,5 +1,3 @@
-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
+TIMESTAMP = 1767466827
+SHA256 (tmux-3.6a.tar.gz) = b6d8d9c76585db8ef5fa00d4931902fa4b8cbe8166f528f44fc403961a3f3759
+SIZE (tmux-3.6a.tar.gz) = 750698
diff --git a/sysutils/tmux/files/patch-server-fn.c b/sysutils/tmux/files/patch-server-fn.c
deleted file mode 100644
index 3b3f4c30a20b..000000000000
--- a/sysutils/tmux/files/patch-server-fn.c
+++ /dev/null
@@ -1,24 +0,0 @@
-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
-
diff --git a/sysutils/tmux/pkg-message b/sysutils/tmux/pkg-message
index 8da2da68a602..9021c80bc1b1 100644
--- a/sysutils/tmux/pkg-message
+++ b/sysutils/tmux/pkg-message
@@ -1,13 +1,18 @@
 [
 {
   type: upgrade
   message: <<EOM
 tmux must be restarted after upgrading.
 
 If you see the following message when you try to attach, it likely means
 you forgot to restart tmux:
 
   open terminal failed: not a terminal
 EOM
 }
+{
+  type: upgrade
+  maximum_version: "3.6a"
+  message: "The bash completions for tmux have been moved to the bash-completion package."
+}
 ]