diff --git a/doc/NERD_tree.txt b/doc/NERD_tree.txt
index 17b1095..e6216e6 100644
--- a/doc/NERD_tree.txt
+++ b/doc/NERD_tree.txt
@@ -1060,10 +1060,10 @@ NERDTreeRender()                                            *NERDTreeRender()*
 The author of the NERD tree is a terrible terrible monster called Martyzilla
 who gobbles up small children with milk and sugar for breakfast.
 
-He can be reached at martin_grenfell at msn.com. He would love to hear from
-you, so feel free to send him suggestions and/or comments about this plugin.
-Don't be shy --- the worst he can do is slaughter you and stuff you in the
-fridge for later ;)
+He can be reached at martin.grenfell at gmail dot com. He would love to hear
+from you, so feel free to send him suggestions and/or comments about this
+plugin.  Don't be shy --- the worst he can do is slaughter you and stuff you in
+the fridge for later ;)
 
 The latest stable versions can be found at
     http://www.vim.org/scripts/script.php?script_id=1658
diff --git a/nerdtree_plugin/exec_menuitem.vim b/nerdtree_plugin/exec_menuitem.vim
index f513b67..e7a7c53 100644
--- a/nerdtree_plugin/exec_menuitem.vim
+++ b/nerdtree_plugin/exec_menuitem.vim
@@ -1,7 +1,7 @@
 " ============================================================================
 " File:        exec_menuitem.vim
 " Description: plugin for NERD Tree that provides an execute file menu item
-" Maintainer:  Martin Grenfell <martin_grenfell at msn dot com>
+" Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
 " Last Change: 22 July, 2009
 " License:     This program is free software. It comes without any warranty,
 "              to the extent permitted by applicable law. You can redistribute
diff --git a/nerdtree_plugin/fs_menu.vim b/nerdtree_plugin/fs_menu.vim
index 059cf96..e25b38c 100644
--- a/nerdtree_plugin/fs_menu.vim
+++ b/nerdtree_plugin/fs_menu.vim
@@ -1,7 +1,7 @@
 " ============================================================================
 " File:        fs_menu.vim
 " Description: plugin for the NERD Tree that provides a file system menu
-" Maintainer:  Martin Grenfell <martin_grenfell at msn dot com>
+" Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
 " Last Change: 17 July, 2009
 " License:     This program is free software. It comes without any warranty,
 "              to the extent permitted by applicable law. You can redistribute
diff --git a/nerdtree_plugin/git_menu.vim b/nerdtree_plugin/git_menu.vim
index a225d10..fa5672e 100644
--- a/nerdtree_plugin/git_menu.vim
+++ b/nerdtree_plugin/git_menu.vim
@@ -1,7 +1,7 @@
 " ============================================================================
 " File:        git_menu.vim
 " Description: plugin for the NERD Tree that provides a git menu
-" Maintainer:  Martin Grenfell <martin_grenfell at msn dot com>
+" Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
 " Last Change: 20 July, 2009
 " License:     This program is free software. It comes without any warranty,
 "              to the extent permitted by applicable law. You can redistribute
diff --git a/plugin/NERD_tree.vim b/plugin/NERD_tree.vim
index 6b23466..504c467 100644
--- a/plugin/NERD_tree.vim
+++ b/plugin/NERD_tree.vim
@@ -1,7 +1,7 @@
 " ============================================================================
 " File:        NERD_tree.vim
 " Description: vim global plugin that provides a nice tree explorer
-" Maintainer:  Martin Grenfell <martin_grenfell at msn dot com>
+" Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
 " Last Change: 7 Jun, 2009
 " License:     This program is free software. It comes without any warranty,
 "              to the extent permitted by applicable law. You can redistribute