diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template
index 28283ada3cc..d13330e3b7d 100644
--- a/srcpkgs/vim/template
+++ b/srcpkgs/vim/template
@@ -1,9 +1,9 @@
 # Template file for 'vim'
 pkgname=vim
 _distver=7.4
-_patchver=169
+_patchver=193
 version=${_distver}.${_patchver}
-revision=3
+revision=1
 hostmakedepends="mercurial pkg-config"
 makedepends="ncurses-devel acl-devel libXt-devel gtk+-devel
   desktop-file-utils hicolor-icon-theme ruby-devel python-devel lua-devel perl"
@@ -13,33 +13,38 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.vim.org"
 license="GPL-2"
 
+VIM_SUBPKGS="vim-x11 gvim"
+# XXX vim-huge cannot be cross compiled for now.
+if [ -z "$CROSS_BUILD" ]; then
+	VIM_SUBPKGS+=" vim-huge"
+fi
+
 do_fetch() {
 	local url="http://code.google.com/p/vim/"
 	hg clone -u v${_distver/./-}-${_patchver} ${url} ${pkgname}-${version}
 }
 
 pre_configure() {
-	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
-	mkdir -p /tmp/vim-huge
-	cp -a $wrksrc/* /tmp/vim-huge
-	mv /tmp/vim-huge $wrksrc/vim-huge
+	for f in ${VIM_SUBPKGS}; do
+		mkdir -p /tmp/${f}
+		cp -a $wrksrc/* /tmp/${f}
+		mv /tmp/${f} $wrksrc/${f}
+	done
 }
 
 do_configure() {
-	args+=" --disable-perlinterp --disable-pythoninterp
-		--disable-rubyinterp --disable-cscope --disable-workshop
+	args="--enable-cscope --enable-multibyte --with-tlib=ncursesw
+		--with-ex-name=vim-ex --with-view-name=vim-view"
+
+	nohuge_args="--disable-perlinterp --disable-pythoninterp
+		--disable-rubyinterp --disable-workshop
 		--disable-netbeans --disable-sniff --disable-gpm
-		--disable-hangulinput --disable-xim --enable-multibyte
-		--with-tlib=ncursesw --with-ex-name=vim-ex
-		--with-view-name=vim-view "
+		--disable-hangulinput --disable-xim"
 
 	if [ "$CROSS_BUILD" ]; then
-		configure_args+=" vim_cv_toupper_broken=no vim_cv_terminfo=yes
+		configure_args+="
+			--host=${XBPS_CROSS_TRIPLET}
+			vim_cv_toupper_broken=no vim_cv_terminfo=yes
 			vim_cv_tty_group=world vim_cv_getcwd_broken=no
 			vim_cv_stat_ignores_slash=yes
 			vim_cv_memmove_handles_overlap=yes
@@ -48,26 +53,28 @@ do_configure() {
 
 	# Normal version.
 	cd $wrksrc
-	./configure ${configure_args} ${args} --enable-gui=no --with-x=no
+	./configure ${configure_args} ${args} ${nohuge_args} --enable-gui=no --with-x=no
 
 	# X11 version.
 	cd $wrksrc/vim-x11
-	./configure ${configure_args} ${args} --enable-gui=no --with-x
+	./configure ${configure_args} ${args} ${nohuge_args} --enable-gui=no --with-x
 
 	# GTK+ version.
 	cd $wrksrc/gvim
-	./configure ${configure_args} ${args} --enable-gui=gtk2 --with-x --with-vim-name=gvim
+	./configure ${configure_args} ${args} ${nohuge_args} --enable-gui=gtk2 --with-x --with-vim-name=gvim
 
 	# Huge version.
 	cd $wrksrc/vim-huge
-	./configure ${configure_args} --with-features=huge --with-x=no --enable-gui=no
+	./configure ${configure_args} ${args} --with-x=no --enable-gui=no \
+		--with-features=huge --enable-perlinterp --enable-pythoninterp \
+		--enable-rubyinterp --enable-luainterp
 }
 
 do_build() {
 	cd $wrksrc
 	make ${makejobs}
 
-	for f in vim-x11 gvim; do
+	for f in ${VIM_SUBPKGS}; do
 		cd $wrksrc/$f
 		make ${makejobs}
 	done
@@ -120,8 +127,11 @@ gvim_package() {
 	}
 }
 
+# XXX disabled for cross builds.
+if [ -z "$CROSS_BUILD" ]; then
+
 vim-huge_package() {
-	depends="vim-common-${version}_${revision}"
+	depends="python vim-common-${version}_${revision}"
 	short_desc+=" - Huge (all features enabled)"
 	provides="vim-${version}_${revision}"
 	replaces="vim>=0"
@@ -132,3 +142,5 @@ vim-huge_package() {
 		rm -rf $PKGDESTDIR/usr/share
 	}
 }
+
+fi