Index: head/sysutils/tmux/Makefile
===================================================================
--- head/sysutils/tmux/Makefile
+++ head/sysutils/tmux/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	tmux
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:S/a$//}
 
Index: head/sysutils/tmux/files/patch-git_2c53b23d
===================================================================
--- head/sysutils/tmux/files/patch-git_2c53b23d
+++ head/sysutils/tmux/files/patch-git_2c53b23d
@@ -0,0 +1,35 @@
+commit 2c53b23d5968da2e796ead6ed9f8ff3c33b8bbfb
+Author: nicm <nicm>
+Date:   Tue May 19 08:48:37 2015 +0000
+
+    In terminfo, sometimes cvvis implies cnorm and sometimes it doesn't, so
+    don't assume it does. Fixes missing cursor with emacs-in-tmux-in-tmux.
+
+--- tty.c
++++ tty.c
+@@ -507,14 +507,17 @@ tty_update_mode(struct tty *tty, int mode, struct screen *s)
+ 		mode &= ~MODE_CURSOR;
+ 
+ 	changed = mode ^ tty->mode;
+-	if (changed & (MODE_CURSOR|MODE_BLINKING)) {
+-		if (mode & MODE_CURSOR) {
+-			if (mode & MODE_BLINKING &&
+-			    tty_term_has(tty->term, TTYC_CVVIS))
+-				tty_putcode(tty, TTYC_CVVIS);
+-			else
+-				tty_putcode(tty, TTYC_CNORM);
+-		} else
++	if (changed & MODE_BLINKING) {
++		if (tty_term_has(tty->term, TTYC_CVVIS))
++			tty_putcode(tty, TTYC_CVVIS);
++		else
++			tty_putcode(tty, TTYC_CNORM);
++		changed |= MODE_CURSOR;
++	}
++	if (changed & MODE_CURSOR) {
++		if (mode & MODE_CURSOR)
++			tty_putcode(tty, TTYC_CNORM);
++		else
+ 			tty_putcode(tty, TTYC_CIVIS);
+ 	}
+ 	if (s != NULL && tty->cstyle != s->cstyle) {