diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template
index 0c919f806a1..e2f7207a51a 100644
--- a/srcpkgs/vim/template
+++ b/srcpkgs/vim/template
@@ -39,9 +39,9 @@ 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
+	for f in vim-normal ${_subdirs}; do
 		rm -rf ${f}
-		cp -a vim-${version} ${_subdirs}
+		cp -r vim-${version} ${f}
 	done
 }
 
@@ -64,7 +64,7 @@ do_configure() {
 	fi
 
 	# Normal version.
-	cd $wrksrc
+	cd $wrksrc/vim-normal
 	./configure ${configure_args} ${args} ${nohuge_args} --disable-xim --enable-gui=no --with-x=no
 
 	# X11 version.
@@ -99,10 +99,7 @@ do_configure() {
 }
 
 do_build() {
-	cd $wrksrc
-	make ${makejobs}
-
-	for f in ${_subdirs}; do
+	for f in vim-normal ${_subdirs}; do
 		cd $wrksrc/$f
 		make ${makejobs}
 	done
@@ -110,11 +107,12 @@ do_build() {
 }
 
 do_check() {
-	cd $wrksrc
+	cd $wrksrc/vim-normal
 	TERM=xterm make test
 }
 
 do_install() {
+	cd $wrksrc/vim-normal
 	make DESTDIR=$DESTDIR install
 	vlicense runtime/doc/uganda.txt LICENSE