-TERMUX_PKG_HOMEPAGE=http://neovim.org/
-TERMUX_PKG_DESCRIPTION="Ambitious Vim-fork focused on extensibility and agility"
-TERMUX_PKG_VERSION=0.0.`date "+%Y%m%d%H%M"`
-TERMUX_PKG_SRCURL=https://github.com/neovim/neovim/archive/master.zip
-TERMUX_PKG_NO_SRC_CACHE=yes
-TERMUX_PKG_DEPENDS="libuv, libmsgpack, libandroid-support, libluajit, libvterm, libtermkey"
-TERMUX_PKG_FOLDERNAME="neovim-master"
+TERMUX_PKG_HOMEPAGE=https://neovim.io/
+TERMUX_PKG_DESCRIPTION="Ambitious Vim-fork focused on extensibility and agility (nvim)"
+local _COMMIT=4dee942e732d41ad62b732c0a39719d9405bc928
+TERMUX_PKG_VERSION=0.2.1~20170715
+TERMUX_PKG_SRCURL=https://github.com/neovim/neovim/archive/${_COMMIT}.zip
+TERMUX_PKG_SHA256=47d13c7be30ba8e98a4f903ad94b1c59dd9a85b9f6505a163df599b1e697a9b8
+TERMUX_PKG_DEPENDS="libuv, libmsgpack, libandroid-support, libvterm, libtermkey, libutil, liblua"
+TERMUX_PKG_FOLDERNAME="neovim-$_COMMIT"
+TERMUX_PKG_HOSTBUILD=true
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+-DENABLE_JEMALLOC=OFF
+-DGETTEXT_MSGFMT_EXECUTABLE=`which msgfmt`
+-DGETTEXT_MSGMERGE_EXECUTABLE=`which msgmerge`
+-DGPERF_PRG=$TERMUX_PKG_HOSTBUILD_DIR/deps/usr/bin/gperf
+-DLUA_PRG=$TERMUX_PKG_HOSTBUILD_DIR/deps/usr/bin/luajit
+-DPKG_CONFIG_EXECUTABLE=`which pkg-config`
+-DXGETTEXT_PRG=`which xgettext`
+-DPREFER_LUA=ON
+-DLUA_INCLUDE_DIR=$TERMUX_PREFIX/include
+"
+TERMUX_PKG_CONFFILES="share/nvim/sysinit.vim"