diff --git a/352.vim.build b/352.vim.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/352.vim.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/352.vim.vars b/352.vim.vars
new file mode 100644
index 0000000..19300e9
--- /dev/null
+++ b/352.vim.vars
@@ -0,0 +1,17 @@
+#
+# . ./build.vars and set -o errexit are assumed.
+#
+
+pkg_vim_configure_pre() {
+	export vim_cv_bcopy_handles_overlap=true;
+	export vim_cv_getcwd_broken=false;
+	export vim_cv_memcpy_handles_overlap=false;
+	export vim_cv_memmove_handles_overlap=true;
+	export vim_cv_stat_ignores_slash=false;
+	export vim_cv_terminfo=true;
+	export vim_cv_toupper_broken=false;
+	export vim_cv_tty_group=tty;
+	export vim_cv_tty_mode=0666;
+};
+
+# vim:filetype=sh
diff --git a/352.which.build b/352.which.build
deleted file mode 120000
index 52bb82e..0000000
--- a/352.which.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/353.which.build b/353.which.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/353.which.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/353.zsh.build b/353.zsh.build
deleted file mode 120000
index 52bb82e..0000000
--- a/353.zsh.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/354.zsh.build b/354.zsh.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/354.zsh.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/build.vars b/build.vars
index de09ca5..58bee2b 100644
--- a/build.vars
+++ b/build.vars
@@ -53,7 +53,7 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
 : ${WGET_ARGS:="--no-check-certificate"};
 : ${WORKDIR:=${PREFIX}/tmp};
 
-: ${PKG_BUILD_NAMES:="apk_tools bash binutils binutils_host bzip2 coreutils curl dalist dash diffutils findutils gawk git glib gmp grep gzip hexcurse inetutils irssi less libarchive libelf libevent libfetch libffi libnbcompat libressl libz lua make mksh mpc mpfr nano ncurses ncursestw ncursesw netcat ntapi ntcon ntctty openssh pacman patch pemagine perl pkgconf pkgconf_host popt psxscl psxstub psxtypes python3 rsync sed slibtool tar tcsh tmux util_linux which xz zsh"};
+: ${PKG_BUILD_NAMES:="apk_tools bash binutils binutils_host bzip2 coreutils curl dalist dash diffutils findutils gawk git glib gmp grep gzip hexcurse inetutils irssi less libarchive libelf libevent libfetch libffi libnbcompat libressl libz lua make mksh mpc mpfr nano ncurses ncursestw ncursesw netcat ntapi ntcon ntctty openssh pacman patch pemagine perl pkgconf pkgconf_host popt psxscl psxstub psxtypes python3 rsync sed slibtool tar tcsh tmux util_linux vim which xz zsh"};
 : ${PKG_BUILD_VARS:="AR_BUILD AR_CONFIGURE AR_INSTALL AUTOCONF AUTOGEN BUILD_DIR BUILD_TYPE CC_BUILD CC_CONFIGURE CC_INSTALL CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA CFLAGS_INSTALL_EXTRA CONFIGURE_ARGS CONFIGURE_ARGS_EXTRA ENV_VARS_EXTRA FNAME GIT_ARGS_EXTRA INSTALL_TARGET LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE LDFLAGS_CONFIGURE_EXTRA LDFLAGS_INSTALL_EXTRA LIBFILES_FIX LIBTOOL_MIDIPIX LIBTOOL_MIDIPIX_FIX MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA NO_CLEAN PATCHES_EXTRA_URL PREFIX_EXTRA RANLIB_BUILD RANLIB_INSTALL SHA256SUM SLIBTOOL SUBDIR SUBDIR_CREATE URL URL_FNAME URL_TYPE VERSION"};
 : ${PKG_LVL0_CFLAGS_CONFIGURE:=-O0};
 : ${PKG_LVL0_CONFIGURE_ARGS:="-C --disable-nls --host=${HOST_NATIVE} --prefix= --target=${TARGET}"};
@@ -359,6 +359,12 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
 : ${PKG_UTIL_LINUX_URL:=https://www.kernel.org/pub/linux/utils/util-linux/v2.27/util-linux-${PKG_UTIL_LINUX_VERSION}.tar.gz};
 : ${PKG_UTIL_LINUX_CONFIGURE_ARGS_EXTRA:=--disable-agetty --disable-wall --disable-write};
 : ${PKG_UTIL_LINUX_MAKEFLAGS_BUILD_EXTRA:=V=99};
+: ${PKG_VIM_VERSION:=7.4.1952};
+: ${PKG_VIM_SHA256SUM:=8de19b12cabde17b87f915a05e1855f6ff8404962947c5cf2204cf51f1ce5d67};
+: ${PKG_VIM_URL:=https://github.com/vim/vim/archive/v${PKG_VIM_VERSION}.tar.gz};
+: ${PKG_VIM_SUBDIR:=vim-${PKG_VIM_VERSION}};
+: ${PKG_VIM_BUILD_DIR:=${PKG_VIM_SUBDIR}};
+: ${PKG_VIM_CONFIGURE_ARGS_EXTRA:=--with-tlib=ncursesw};
 : ${PKG_WHICH_VERSION:=2.21};
 : ${PKG_WHICH_SHA256SUM:=f4a245b94124b377d8b49646bf421f9155d36aa7614b6ebf83705d3ffc76eaad};
 : ${PKG_WHICH_URL:=https://ftp.gnu.org/gnu/which/which-${PKG_WHICH_VERSION}.tar.gz};