diff --git a/vim.spec b/vim.spec
index 850bafb..1942877 100644
--- a/vim.spec
+++ b/vim.spec
@@ -2,7 +2,7 @@ Summary: The VIM editor.
 Name: vim
 Version: 5.8
 %define vimversion vim58
-Release: 6
+Release: 7
 License: freeware
 Group: Applications/Editors
 Source0: ftp://ftp.home.vim.org/pub/vim/unix/vim-%{version}-src.tar.bz2
@@ -133,7 +133,7 @@ cd src
 perl -pi -e "s,\\\$VIMRUNTIME,%{_datadir}/vim/%{vimversion},g" os_unix.h
 perl -pi -e "s,\\\$VIM,%{_datadir}/vim/%{vimversion}/macros,g" os_unix.h
 # Build gvim.
-%configure --enable-max-features=yes --enable-pythoninterp --enable-perlinterp --disable-tclinterp --with-x=yes --enable-gui=gtk --exec-prefix=/usr/X11R6
+%configure --enable-max-features=yes --enable-pythoninterp --enable-perlinterp --disable-tclinterp --with-x=yes --enable-gui=gtk --enable-fontset --enable-xim --exec-prefix=/usr/X11R6
 make 
 cp vim gvim
 make clean
@@ -255,6 +255,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/gvim.*
 
 %changelog
+* Tue Aug  7 2001 Yukihiro Nakai <ynakai@redhat.com>
+- Add language settings to vimrc
+- Build gvim with  --enable-fontset --enable-xim
+
 * Fri Jul 20 2001 Tim Powers <timp@redhat.com>
 - don't alias vi to be vim.
 
diff --git a/vimrc b/vimrc
index d06ded3..a6d3c53 100644
--- a/vimrc
+++ b/vimrc
@@ -85,3 +85,20 @@ nmap ,hs wbi<strong><ESC>ea</strong><ESC>bb
 nmap ,ht wbi<tt><ESC>ea</tt><ESC>bb
 nmap ,hx wbF<df>f<df>
 
+" Language definition
+if $LANG =~ "^ko"
+     set fe=korea
+     set guifontset=-*-*-medium-r-normal--16-*-*-*-*-*-*-*,*
+elseif $LANG =~ "^ja"
+     set fe=japan
+     set guifontset=-misc-fixed-medium-r-normal--14-*-*-*-*-*-*-*,*
+elseif $LANG =~ "^zh_TW"
+     set fe=taiwan
+     set guifontset=-*-*-medium-r-normal--16-*-*-*-*-*-*-*,*
+elseif $LANG =~ "^zh_CN"
+     set fe=prc
+     set guifontset=-*-*-medium-r-normal--16-*-*-*-*-*-*-*,*
+endif
+if $LANG =~ "utf8$" || $LANG =~ "UTF-8$"
+    set fe=unicode
+endif