diff --git a/srcpkgs/gvim/template b/srcpkgs/gvim/template
index 1b9d581ea72..901af33cd49 100644
--- a/srcpkgs/gvim/template
+++ b/srcpkgs/gvim/template
@@ -4,7 +4,7 @@
 # to duplicate all this stuff again!
 #
 . ${XBPS_SRCPKGDIR}/vim/template
-unset subpackages
+unset subpackages revision
 
 pkgname=gvim
 configure_args="${configure_args} --enable-gui=gtk2 --with-x
@@ -49,14 +49,14 @@ Add_dependency full hicolor-icon-theme
 
 pre_install()
 {
-	sed -i "s|/locolor|/hicolor|g" ${wrksrc}/src/Makefile || return 1
+	cd ${wrksrc}/${build_wrksrc}
+	sed -i "s|/locolor|/hicolor|g" src/Makefile
 	for d in 16 32 48; do
-		install -d ${DESTDIR}/usr/share/icons/hicolor/${d}x${d}/apps
+		vmkdir usr/share/icons/hicolor/${d}x${d}/apps
 	done
 }
 
 post_install()
 {
-	install -D -m644 ${FILESDIR}/gvim.desktop \
-		${DESTDIR}/usr/share/applications/gvim.desktop
+	vinstall ${FILESDIR}/gvim.desktop 644 usr/share/applications
 }