diff --git a/data/tools/about_cfg_to_wiki b/data/tools/about_cfg_to_wiki
index 73069e20731..6c5c16027d5 100755
--- a/data/tools/about_cfg_to_wiki
+++ b/data/tools/about_cfg_to_wiki
@@ -56,6 +56,10 @@ if __name__ == "__main__":
                 comment = entry.get_text_val("comment", "")
                 wikiuser = entry.get_text_val("wikiuser", "")
                 email = entry.get_text_val("email", "")
+                # Mask email names from spammers
+                email = email.replace("@", "@").replace(".", ".")
+                # Interpret our local conventions for obfuscsting in SVN files
+                email = email.replace("_AT_", "@").replace("_dot_", ".")
                 section.lines.append((name, comment, wikiuser, email))
             if section.title: sections.append(section)
         chapters.append((arg, sections))