diff --git a/srcpkgs/vim-huge-python3 b/srcpkgs/vim-huge-python3
new file mode 120000
index 00000000000..7923f59d710
--- /dev/null
+++ b/srcpkgs/vim-huge-python3
@@ -0,0 +1 @@
+vim
\ No newline at end of file
diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template
index 896d42216a0..1b6435cd346 100644
--- a/srcpkgs/vim/template
+++ b/srcpkgs/vim/template
@@ -3,10 +3,10 @@ pkgname=vim
 _distver=7.4
 _patchver=729
 version=${_distver}.${_patchver}
-revision=2
+revision=3
 hostmakedepends="mercurial pkg-config"
 makedepends="ncurses-devel acl-devel libXt-devel gtk+-devel perl
- ruby-devel python-devel lua-devel"
+ ruby-devel python-devel python3.4-devel lua-devel"
 depends="vim-common>=$version"
 short_desc="Vim editor (vi clone)"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
@@ -16,7 +16,7 @@ license="GPL-2"
 subpackages="vim-common vim-x11 gvim"
 # XXX vim-huge cannot be cross compiled for now.
 if [ -z "$CROSS_BUILD" ]; then
-	subpackages+=" vim-huge"
+	subpackages+=" vim-huge vim-huge-python3"
 fi
 
 do_fetch() {
@@ -63,12 +63,17 @@ do_configure() {
 	cd $wrksrc/gvim
 	./configure ${configure_args} ${args} ${nohuge_args} --enable-gui=gtk2 --with-x --with-vim-name=gvim
 
-	# Huge version.
+	# Huge versions
 	if [ -z "$CROSS_BUILD" ]; then
 		cd $wrksrc/vim-huge
 		./configure ${configure_args} ${args} --with-x=no --enable-gui=no \
 			--with-features=huge --enable-perlinterp --enable-pythoninterp \
 			--enable-rubyinterp --enable-luainterp
+
+		cd $wrksrc/vim-huge-python3
+		./configure ${configure_args} ${args} --with-x=no --enable-gui=no \
+			--with-features=huge --enable-perlinterp --disable-pythoninterp --enable-python3interp \
+			--enable-rubyinterp --enable-luainterp
 	fi
 }
 
@@ -129,7 +134,7 @@ gvim_package() {
 }
 vim-huge_package() {
 	depends="python vim-common-${version}_${revision}"
-	short_desc+=" - Huge (all features enabled)"
+	short_desc+=" - Huge (all features enabled, using Python 2)"
 	provides="vim-${version}_${revision}"
 	replaces="vim>=0"
 	pkg_install() {
@@ -139,3 +144,15 @@ vim-huge_package() {
 		rm -rf $PKGDESTDIR/usr/share/vim
 	}
 }
+vim-huge-python3_package() {
+	depends="python3.4 vim-common-${version}_${revision}"
+	short_desc+=" - Huge (all features enabled, using Python 3)"
+	provides="vim-${version}_${revision}"
+	replaces="vim>=0"
+	pkg_install() {
+		cd $wrksrc/vim-huge-python3
+		make DESTDIR=$PKGDESTDIR install
+		rm -f $PKGDESTDIR/usr/bin/{ex,view}
+		rm -rf $PKGDESTDIR/usr/share/vim
+	}
+}