diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index f655539a..ca8151c5 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -3203,12 +3203,15 @@ VimL:
   search_term: vim
   aliases:
   - vim
+  - nvim
   extensions:
   - .vim
   filenames:
+  - .nvimrc
   - .vimrc
   - _vimrc
   - gvimrc
+  - nvimrc
   - vimrc
   ace_mode: text
 
diff --git a/samples/VimL/filenames/.nvimrc b/samples/VimL/filenames/.nvimrc
new file mode 100644
index 00000000..53a65ade
--- /dev/null
+++ b/samples/VimL/filenames/.nvimrc
@@ -0,0 +1,10 @@
+set nocompatible
+set ignorecase
+set smartcase
+set showmatch
+set showcmd
+
+syntax on
+
+set hlsearch " Highlight searches
+set incsearch " Do incremental searching