--- a/components/tmux/Makefile	Tue Aug 23 02:13:19 2016 -0700
+++ b/components/tmux/Makefile	Tue Aug 23 13:14:19 2016 -0700
@@ -23,23 +23,26 @@
 # Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 BUILD_BITS= 64
+# Use GCC until Studio supports large enums (23058232)
+COMPILER=	gcc
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		tmux
-COMPONENT_VERSION=	1.9
-COMPONENT_MICRO_VERSION=	a
-IPS_COMPONENT_VERSION=	1.9.1
-HUMAN_VERSION=		$(COMPONENT_VERSION)$(COMPONENT_MICRO_VERSION)
-COMPONENT_SRC=		$(COMPONENT_NAME)-$(HUMAN_VERSION)
-COMPONENT_PROJECT_URL=	http://tmux.sourceforge.net
+COMPONENT_VERSION=	2.2
+COMPONENT_PROJECT_URL=	http://github.com/tmux/tmux
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:c5e3b22b901cf109b20dab54a4a651f0471abd1f79f6039d79b250d21c2733f5
-COMPONENT_ARCHIVE_URL=	http://sourceforge.net/projects/tmux/files/tmux/$(COMPONENT_NAME)-$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
+    sha256:bc28541b64f99929fe8e3ae7a02291263f3c97730781201824c0f05d7c8e19e4
 
-TPNO=			20510
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)/releases/download/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
+
+TPNO=			31154
 
 TEST_TARGET= $(NO_TESTS)
 include $(WS_MAKE_RULES)/common.mk
 
+CONFIGURE_ENV += LIBNCURSES_CFLAGS=-I$(USRINCDIR)/ncurses
+CONFIGURE_ENV += LIBNCURSES_LIBS="-L$(USRLIBDIR64) -lncurses"
+
 REQUIRED_PACKAGES += library/libevent
+REQUIRED_PACKAGES += library/ncurses
 REQUIRED_PACKAGES += shell/ksh93