diff --git a/vim/.vimrc b/vim/.vimrc
index f21a389..c944871 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -118,7 +118,11 @@ set nocompatible
     set spelllang=en_us,cjk
 
   " Store the viminfo file in the .vim directory "
-    set viminfo+=n$HOME/.vim/.viminfo
+    if !has('nvim')
+      set viminfo+=n$HOME/.vim/.viminfo
+    else
+      set viminfo+=n$HOME/.vim/.shada
+    endif
 
   " Don't use a pager "
     set nomore