diff --git a/runtime/ftplugin/mrxvtrc.vim b/runtime/ftplugin/mrxvtrc.vim
index d1313bc..15cc0db 100644
--- a/runtime/ftplugin/mrxvtrc.vim
+++ b/runtime/ftplugin/mrxvtrc.vim
@@ -1,5 +1,5 @@
 " Created	: Wed 26 Apr 2006 01:20:53 AM CDT
-" Modified	: Thu 27 Apr 2006 03:29:13 AM CDT
+" Modified	: Fri 28 Apr 2006 03:24:01 AM CDT
 " Author	: Gautam Iyer <gi1242@users.sourceforge.net>
 " Description	: ftplugin for mrxvtrc
 
@@ -10,5 +10,13 @@
 
 let b:undo_ftplugin = "setl com< cms< fo<"
 
-setlocal comments=:! commentstring=!\ %s formatoptions-=t formatoptions+=croql
+" Really any line that does not match an option is a comment. But use '!' for
+" compatibility with x-defaults files, and "#" (preferred) for compatibility
+" with all other config files.
+"
+" Comments beginning with "#" are preferred because Vim will not flag the
+" first word as a spelling error if it is not capitalised. The '!' used as
+" comment leaders makes Vim think that every comment line is a new sentence.
 
+setlocal comments=:!,:# commentstring=#\ %s
+setlocal formatoptions-=t formatoptions+=croql