diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 5e3fbfb..146537a 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -1 +1 @@
-DIST tmux-2.6.tar.gz 481000 SHA256 b17cd170a94d7b58c0698752e1f4f263ab6dc47425230df7e53a6435cc7cd7e8 SHA512 20a1ae8b8494c5b42757902322f3877731c2cc330c9c00f097a317785d25252b7ebaa8bbab9fc17843299e80cb2914aaac0a664715a85c50f7ea489d23753832 WHIRLPOOL 03406ce2bd86a3cabaccea0dbe5c2ed8c9e97aa66ae492c9682d0b4a64a76210adf12b6c163b45212e4932a555912b3e6841c268e7710f49136dd7866e53d416
+DIST tmux-3.0a.tar.gz 546377 BLAKE2B 1e784d98e1f18e7850e92d8d5f849ee1b8bcbf62b9323b6eb4007e038bd84480b3a171c93c88954701487ef228db8717bac886f51dd21efdf2766e676b0c16e3 SHA512 f326ee9c0e5e9a46ce9c99c76407b8cf35feea5f898c3c937fd8c5e488ff9a809272de19226d9d10f864e11051dcf633327820b7f8d86d85962da61174bbfb0b
diff --git a/app-misc/tmux/tmux-2.6.ebuild b/app-misc/tmux/tmux-3.0a.ebuild
similarity index 61%
rename from app-misc/tmux/tmux-2.6.ebuild
rename to app-misc/tmux/tmux-3.0a.ebuild
index e8e7cef..560eb0b 100644
--- a/app-misc/tmux/tmux-2.6.ebuild
+++ b/app-misc/tmux/tmux-3.0a.ebuild
@@ -1,46 +1,51 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools flag-o-matic versionator
+inherit autotools flag-o-matic
 
 DESCRIPTION="Terminal multiplexer"
-HOMEPAGE="http://tmux.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_*}/${P/_/-}.tar.gz"
+HOMEPAGE="https://tmux.github.io/"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	SRC_URI="https://raw.githubusercontent.com/przepompownia/tmux-bash-completion/678a27616b70c649c6701cae9cd8c92b58cc051b/completions/tmux -> tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b"
+	EGIT_REPO_URI="https://github.com/tmux/tmux.git"
+else
+	SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
+	[[ "${PV}" == *_rc* ]] || \
+	KEYWORDS="*"
+	S="${WORKDIR}/${P/_/-}"
+fi
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="*"
 IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
 
-CDEPEND="
+DEPEND="
 	dev-libs/libevent:0=
 	sys-libs/ncurses:0=
 	utempter? (
 		kernel_linux? ( sys-libs/libutempter )
 		kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
-	)
-"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-screen )
-	vim-syntax? (
-		|| (
-			app-editors/vim
-			app-editors/gvim
-		)
 	)"
 
-DOCS=( CHANGES README TODO )
+BDEPEND="
+	virtual/pkgconfig
+	virtual/yacc
+"
 
-S="${WORKDIR}/${P/_/-}"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-screen )
+	vim-syntax? ( app-vim/vim-tmux )"
+
+DOCS=( CHANGES README )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.4-flags.patch
+	"${FILESDIR}/${PN}-2.4-flags.patch"
 
-	# usptream fixes (can be removed with next version bump)
+	# upstream fixes (can be removed with next version bump)
 )
 
 src_prepare() {
@@ -48,11 +53,7 @@
 	# 1.7 segfaults when entering copy mode if compiled with -Os
 	replace-flags -Os -O2
 
-	# regenerate aclocal.m4 to support earlier automake versions
-	rm aclocal.m4 || die
-
 	default
-
 	eautoreconf
 }
 
@@ -75,7 +76,7 @@
 }
 
 pkg_postinst() {
-	if ! version_is_at_least 1.9a ${REPLACING_VERSIONS:-1.9a}; then
+	if ! ver_test 1.9a -ge ${REPLACING_VERSIONS:-1.9a}; then
 		echo
 		ewarn "Some configuration options changed in this release."
 		ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
diff --git a/metadata/md5-cache/app-misc/tmux-2.6 b/metadata/md5-cache/app-misc/tmux-2.6
deleted file mode 100644
index 9214768..0000000
--- a/metadata/md5-cache/app-misc/tmux-2.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/libevent:0= sys-libs/ncurses:0= utempter? ( kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Terminal multiplexer
-EAPI=6
-HOMEPAGE=http://tmux.github.io/
-IUSE=debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux
-KEYWORDS=*
-LICENSE=ISC
-RDEPEND=dev-libs/libevent:0= sys-libs/ncurses:0= utempter? ( kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) ) selinux? ( sec-policy/selinux-screen ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-SLOT=0
-SRC_URI=https://github.com/tmux/tmux/releases/download/2.6/tmux-2.6.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	209edad4a5c4812e7b2f8021650974f0	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=bfbf1bc98bfd514cf2de47e8fd0ea3ac
diff --git a/metadata/md5-cache/app-misc/tmux-3.0a b/metadata/md5-cache/app-misc/tmux-3.0a
new file mode 100644
index 0000000..f397b51
--- /dev/null
+++ b/metadata/md5-cache/app-misc/tmux-3.0a
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig virtual/yacc >=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=dev-libs/libevent:0= sys-libs/ncurses:0= utempter? ( kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Terminal multiplexer
+EAPI=7
+HOMEPAGE=https://tmux.github.io/
+IUSE=debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux
+KEYWORDS=*
+LICENSE=ISC
+RDEPEND=dev-libs/libevent:0= sys-libs/ncurses:0= utempter? ( kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) ) selinux? ( sec-policy/selinux-screen ) vim-syntax? ( app-vim/vim-tmux )
+SLOT=0
+SRC_URI=https://github.com/tmux/tmux/releases/download/3.0a/tmux-3.0a.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	209edad4a5c4812e7b2f8021650974f0
+_md5_=900694496d0bf542b1456f57f81d5ea4