diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template
index b452f4e475..9d1df51c8a 100644
--- a/srcpkgs/vim/template
+++ b/srcpkgs/vim/template
@@ -1,7 +1,7 @@
 # Template file for 'vim'
 pkgname=vim
 _distver=7.4
-_patchver=537
+_patchver=557
 version=${_distver}.${_patchver}
 revision=1
 hostmakedepends="mercurial pkg-config"
@@ -40,7 +40,7 @@ do_configure() {
 	nohuge_args="--disable-perlinterp --disable-pythoninterp
 		--disable-rubyinterp --disable-workshop
 		--disable-netbeans --disable-sniff --disable-gpm
-		--disable-hangulinput --disable-xim"
+		--disable-hangulinput"
 
 	if [ "$CROSS_BUILD" ]; then
 		configure_args+="
@@ -54,7 +54,7 @@ do_configure() {
 
 	# Normal version.
 	cd $wrksrc
-	./configure ${configure_args} ${args} ${nohuge_args} --enable-gui=no --with-x=no
+	./configure ${configure_args} ${args} ${nohuge_args} --disable-xim --enable-gui=no --with-x=no
 
 	# X11 version.
 	cd $wrksrc/vim-x11
@@ -79,7 +79,7 @@ do_build() {
 
 	for f in ${subpackages/vim-common/}; do
 		cd $wrksrc/$f
-		make ${makejobs}
+		make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" ${makejobs}
 	done
 
 }