diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 243790d..d1a7d7e 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -10,7 +10,8 @@ Most issues are related to bugs or problems. In these cases, you should
 include a minimal working example and a minimal vimrc file (see below), as
 well as:
 
-1. What vim version are you using?
+1. What vim version are you using?  If using neovim, Are you using
+   tree-sitter or classic matching?
 2. Steps to reproduce
 3. Expected behavior
 4. Observed behavior
diff --git a/README.md b/README.md
index 75a9c7b..c88e77f 100644
--- a/README.md
+++ b/README.md
@@ -803,12 +803,17 @@ See for instance one of the following plugins for this;
 ### Matchit
 
 match-up tries to work around matchit.vim in all cases, but if
-you experience problems, read the following.
-matchit.vim should not be loaded.  If it is loaded, it should be loaded
-after match-up (in this case, matchit.vim will be disabled).  Note that
-some plugins, such as
-[vim-sensible](https://github.com/tpope/vim-sensible),
-load matchit.vim so these should also be initialized after match-up.
+you experience problems, read the following:
+
+- For vim, matchit.vim should not be loaded.  If it is loaded, it should
+  be loaded after match-up (in this case, matchit.vim will be disabled).
+  Note that some plugins, such as
+  [vim-sensible](https://github.com/tpope/vim-sensible), load matchit.vim
+  so these should also be initialized after match-up.
+
+- For neovim, matchit.vim is loaded by default.  This should not cause any
+  problems, but you may see a very slight start-up time improvement by
+  setting `let g:loaded_matchit = 1` in your `init.vim`.
 
 ### Matchparen emulation