diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template
index 25ad586cae2..0c919f806a1 100644
--- a/srcpkgs/vim/template
+++ b/srcpkgs/vim/template
@@ -1,7 +1,8 @@
 # Template file for 'vim'
 pkgname=vim
 version=9.0.1321
-revision=1
+revision=2
+create_wrksrc=required
 hostmakedepends="gettext glib-devel pkg-config"
 makedepends="acl-devel ncurses-devel
  $(vopt_if x11 libXt-devel)
@@ -13,8 +14,10 @@ short_desc="Vim editor (vi clone)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Vim"
 homepage="https://www.vim.org"
-distfiles="https://github.com/vim/vim/archive/v${version}.tar.gz"
-checksum=8334f08acbd351c27af6d191d8215c8402ceb4ebda51a1dc5c8144f45418df0f
+distfiles="https://github.com/vim/vim/archive/v${version}.tar.gz
+ https://www.drchip.org/astronaut/vim/syntax/sh.vim.gz"
+checksum="8334f08acbd351c27af6d191d8215c8402ceb4ebda51a1dc5c8144f45418df0f
+ 7da50517fb9f6ae4c35789e75ab44dedeca7e1364ec325e3501578d8102d515d"
 python_version=3
 
 build_options="x11 gtk3 huge"
@@ -33,10 +36,12 @@ _subdirs="$(vopt_if x11 vim-x11) $(vopt_if gtk3 gvim)
 alternatives="vim:vim:/usr/bin/vim-normal"
 
 pre_configure() {
+	local f
+	# https://github.com/vim/vim/issues/11977
+	cp sh.vim vim-${version}/runtime/syntax/sh.vim
 	for f in ${_subdirs}; do
-		mkdir -p /tmp/${f}
-		cp -a $wrksrc/* /tmp/${f}
-		mv /tmp/${f} $wrksrc/${f}
+		rm -rf ${f}
+		cp -a vim-${version} ${_subdirs}
 	done
 }