Index: head/sysutils/tmux/Makefile
===================================================================
--- head/sysutils/tmux/Makefile	(revision 452345)
+++ head/sysutils/tmux/Makefile	(revision 452346)
@@ -1,65 +1,64 @@
 # Created by: Wen Heping <wenheping@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	tmux
-PORTVERSION=	2.5
-PORTREVISION=	1
+PORTVERSION=	2.6
 CATEGORIES=	sysutils
 MASTER_SITES=	https://github.com/tmux/tmux/releases/download/${PORTVERSION}/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Terminal Multiplexer
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		pkgconfig ncurses
 
 USE_GITHUB=	nodefault
 GH_TUPLE=	imomaliev:tmux-bash-completion:ef56d3e:bash
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc --enable-utempter
 
 PLIST_FILES=	bin/tmux \
 		man/man1/tmux.1.gz \
 		etc/bash_completion.d/tmux
 
-PORTDOCS=	CHANGES FAQ README TODO
+PORTDOCS=	CHANGES README TODO
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES LIBEVENT_STATIC BACKSPACE
 
 LIBEVENT_STATIC_DESC=	Build with static libevent
 BACKSPACE_DESC=	Build with tty/keys patch
 
 BACKSPACE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-tty-keys.c
 
 LIBEVENT_STATIC_LIB_DEPENDS_OFF=	libevent.so:devel/libevent
 LIBEVENT_STATIC_BUILD_DEPENDS=	${LOCALBASE}/lib/libevent.a:devel/libevent
 LIBEVENT_STATIC_VARS=	LESTATIC=${LOCALBASE}/lib/libevent.a
 
 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}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tmux ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/tmux.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${INSTALL_DATA} ${WRKSRC_bash}/completions/tmux ${STAGEDIR}${PREFIX}/etc/bash_completion.d/tmux
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/example* ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
Index: head/sysutils/tmux/distinfo
===================================================================
--- head/sysutils/tmux/distinfo	(revision 452345)
+++ head/sysutils/tmux/distinfo	(revision 452346)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1497441574
-SHA256 (tmux-2.5.tar.gz) = ae135ec37c1bf6b7750a84e3a35e93d91033a806943e034521c8af51b12d95df
-SIZE (tmux-2.5.tar.gz) = 475717
+TIMESTAMP = 1508340496
+SHA256 (tmux-2.6.tar.gz) = b17cd170a94d7b58c0698752e1f4f263ab6dc47425230df7e53a6435cc7cd7e8
+SIZE (tmux-2.6.tar.gz) = 481000
 SHA256 (imomaliev-tmux-bash-completion-ef56d3e_GH0.tar.gz) = 2f8f3fe586bbdeec9b251ce3ef74f5edef19ba371968a8011acef860ddac59e1
 SIZE (imomaliev-tmux-bash-completion-ef56d3e_GH0.tar.gz) = 1526
Index: head/sysutils/tmux/files/extra-patch-tty-keys.c
===================================================================
--- head/sysutils/tmux/files/extra-patch-tty-keys.c	(revision 452345)
+++ head/sysutils/tmux/files/extra-patch-tty-keys.c	(revision 452346)
@@ -1,11 +1,11 @@
---- tty-keys.c.orig	2016-04-30 12:46:35 UTC
+--- tty-keys.c.orig	2017-08-29 11:54:14 UTC
 +++ tty-keys.c
-@@ -628,8 +628,6 @@ complete_key:
+@@ -679,8 +679,6 @@ complete_key:
  	 * used. termios should have a better idea.
  	 */
  	bspace = tty->tio.c_cc[VERASE];
 -	if (bspace != _POSIX_VDISABLE && (key & KEYC_MASK_KEY) == bspace)
 -		key = (key & KEYC_MASK_MOD) | KEYC_BSPACE;
  
  	/* Remove data from buffer. */
- 	evbuffer_drain(tty->event->input, size);
+ 	evbuffer_drain(tty->in, size);