diff --git a/x11-packages/vim-gtk/build.sh b/x11-packages/vim-gtk/build.sh
index c94b5f79e..3a73fd368 100644
--- a/x11-packages/vim-gtk/build.sh
+++ b/x11-packages/vim-gtk/build.sh
@@ -4,14 +4,19 @@ TERMUX_PKG_LICENSE="VIM License"
 
 # vim should only be updated every 50 releases on multiples of 50.
 TERMUX_PKG_VERSION=8.1.1350
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/vim/vim/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=4a398e3914a8f822a489857e60c905d4593003a982e2b2655d1f893e0124c0ab
-TERMUX_PKG_DEPENDS="gtk3, libice, libiconv, libsm, ncurses, python"
+TERMUX_PKG_DEPENDS="gdk-pixbuf, glib, gtk3, libcairo-x, libice, libiconv, liblua, libsm, libx11, libxpm, libxt, ncurses, pango-x, python"
+TERMUX_PKG_BUILD_DEPENDS="xorgproto"
 TERMUX_PKG_CONFLICTS="vim, vim-python, vim-runtime"
 TERMUX_PKG_BUILD_IN_SRC="yes"
 
 # Basic.
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+ac_cv_small_wchar_t=no
+vi_cv_path_python3_pfx=$TERMUX_PREFIX
+vi_cv_var_python3_version=3.7
 vim_cv_getcwd_broken=no
 vim_cv_memmove_handles_overlap=yes
 vim_cv_stat_ignores_slash=no
@@ -19,23 +24,17 @@ vim_cv_terminfo=yes
 vim_cv_tgetent=zero
 vim_cv_toupper_broken=no
 vim_cv_tty_group=world
+--enable-cscope
 --enable-gui=gtk3
 --enable-multibyte
---with-features=huge
---with-tlib=ncursesw
---enable-cscope
-"
-
-# Python support.
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS+="
-vi_cv_path_python3_pfx=$TERMUX_PREFIX
-vi_cv_var_python3_version=3.7
 --enable-python3interp
+--with-features=huge
 --with-python3-config-dir=$TERMUX_PREFIX/lib/python3.7/config-3.7m/
+--with-tlib=ncursesw
+--with-x
 "
 
 TERMUX_PKG_RM_AFTER_INSTALL="
-share/man/man1/evim.1
 share/vim/vim81/spell/en.ascii*
 share/vim/vim81/print
 share/vim/vim81/tools
@@ -57,12 +56,6 @@ termux_step_pre_configure() {
 
 termux_step_post_make_install() {
 	cp $TERMUX_PKG_BUILDER_DIR/vimrc $TERMUX_PREFIX/share/vim/vimrc
-
-	# Remove most tutor files:
-	cp $TERMUX_PREFIX/share/vim/vim81/tutor/{tutor,tutor.vim,tutor.utf-8} $TERMUX_PKG_TMPDIR/
-	rm -f $TERMUX_PREFIX/share/vim/vim81/tutor/*
-	cp $TERMUX_PKG_TMPDIR/{tutor,tutor.vim,tutor.utf-8} $TERMUX_PREFIX/share/vim/vim81/tutor/
-
 	cd $TERMUX_PREFIX/bin
 	ln -f -s vim vi
 }