diff --git a/packages/tmux/build.sh b/packages/tmux/build.sh
index 660e95383..f5dcd2009 100644
--- a/packages/tmux/build.sh
+++ b/packages/tmux/build.sh
@@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="Terminal multiplexer"
 TERMUX_PKG_LICENSE="BSD"
 # Link against libandroid-support for wcwidth(), see https://github.com/termux/termux-packages/issues/224
 TERMUX_PKG_DEPENDS="ncurses, libevent, libandroid-support, libandroid-glob"
-TERMUX_PKG_VERSION=3.0a
-TERMUX_PKG_SRCURL=https://github.com/tmux/tmux/releases/download/${TERMUX_PKG_VERSION}/tmux-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=4ad1df28b4afa969e59c08061b45082fdc49ff512f30fc8e43217d7b0e5f8db9
+TERMUX_PKG_VERSION=3.1a
+TERMUX_PKG_SRCURL=https://github.com/tmux/tmux/archive/${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=dc70ff5bf2364b3df38d720fca5895b500b34d3e5487506497c2695fca0801a6
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-static"
 TERMUX_PKG_BUILD_IN_SRC=true
 
@@ -13,6 +13,7 @@ TERMUX_PKG_CONFFILES="etc/tmux.conf"
 
 termux_step_pre_configure() {
 	LDFLAGS+=" -landroid-glob"
+	./autogen.sh
 }
 
 termux_step_post_make_install() {
diff --git a/packages/tmux/configure.ac.patch b/packages/tmux/configure.ac.patch
new file mode 100644
index 000000000..dc608d797
--- /dev/null
+++ b/packages/tmux/configure.ac.patch
@@ -0,0 +1,16 @@
+We actually do want tmux.conf to go into ${prefix}/etc,
+since the real /etc is not writeable on Android.
+
+diff -u -r ../tmux-3.1a/configure.ac ./configure.ac
+--- ../tmux-3.1a/configure.ac	2020-04-27 08:38:04.000000000 +0000
++++ ./configure.ac	2020-04-28 22:36:58.650391000 +0000
+@@ -32,9 +32,6 @@
+ PKG_PROG_PKG_CONFIG
+ AC_USE_SYSTEM_EXTENSIONS
+ 
+-# Default tmux.conf goes in /etc not ${prefix}/etc.
+-test "$sysconfdir" = '${prefix}/etc' && sysconfdir=/etc
+-
+ # Is this --enable-debug?
+ case "x$VERSION" in xnext*) enable_debug=yes;; esac
+ AC_ARG_ENABLE(
diff --git a/packages/tmux/configure.patch b/packages/tmux/configure.patch
deleted file mode 100644
index 1d866886b..000000000
--- a/packages/tmux/configure.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-We actually do want tmux.conf to go into ${prefix}/etc,
-since the real /etc is not writeable on Android.
-
-diff -u -r ../tmux-1.9a/configure ./configure
---- ../tmux-1.9a/configure	2014-02-22 21:56:15.000000000 +0100
-+++ ./configure	2014-02-24 08:50:16.000000000 +0100
-@@ -4011,7 +4011,7 @@
- 
- 
- # Default tmux.conf goes in /etc not ${prefix}/etc.
--test "$sysconfdir" = '${prefix}/etc' && sysconfdir=/etc
-+#test "$sysconfdir" = '${prefix}/etc' && sysconfdir=/etc
- 
- # Check for various headers. Alternatives included from compat.h.
-