diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template
index dab341cd6a2..fc037ecb4ca 100644
--- a/srcpkgs/vim/template
+++ b/srcpkgs/vim/template
@@ -1,7 +1,7 @@
 # Template file for 'vim'
 pkgname=vim
 _distver=7.3
-_patchver=798
+_patchver=1200
 version=${_distver}.${_patchver}
 revision=1
 hostmakedepends="mercurial pkg-config"
@@ -21,14 +21,12 @@ do_fetch() {
 }
 
 pre_configure() {
-	if [ -z "$CROSS_BUILD" ]; then
-		mkdir -p /tmp/vim-x11
-		cp -a $wrksrc/* /tmp/vim-x11
-		mv /tmp/vim-x11 $wrksrc/
-		mkdir -p /tmp/gvim
-		cp -a $wrksrc/* /tmp/gvim
-		mv /tmp/gvim $wrksrc/gvim
-	fi
+	mkdir -p /tmp/vim-x11
+	cp -a $wrksrc/* /tmp/vim-x11
+	mv /tmp/vim-x11 $wrksrc/
+	mkdir -p /tmp/gvim
+	cp -a $wrksrc/* /tmp/gvim
+	mv /tmp/gvim $wrksrc/gvim
 }
 
 do_configure() {
@@ -81,7 +79,7 @@ do_install() {
 }
 
 vim-common_package() {
-	short_desc="VI iMproved - common files"
+	short_desc+=" - common files"
 	noarch=yes
 	replaces="vim<=7.2_2"
 	pkg_install() {
@@ -92,18 +90,18 @@ vim-common_package() {
 vim-x11_package() {
 	provides="vim-${version}"
 	replaces="vim>=0"
-	short_desc="VI iMproved - X11 version"
+	short_desc+=" - X11 version"
 	pkg_install() {
 		cd $wrksrc/vim-x11
 		make DESTDIR=$PKGDESTDIR install
-		rm -f ${PKGDESTDIR}/usr/bin/{ex,view}
+		rm -f $PKGDESTDIR/usr/bin/{ex,view}
 		rm -rf $PKGDESTDIR/usr/share
 	}
 }
 
 gvim_package() {
 	depends="desktop-file-utils hicolor-icon-theme"
-	short_desc="VI iMproved - GTK+ GUI"
+	short_desc+=" - GTK+ GUI"
 	pkg_install() {
 		cd $wrksrc/gvim
         	sed -i "s|/locolor|/hicolor|g" src/Makefile