diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 47006a17f413a4cb447260f19dd9dab4c4b452f7..c4296ce4d25eac510f36c975942100be55ca871c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,7 +7,7 @@
 ## Getting help
 
 Community discussion, questions, and informal bug reporting is done on the
-[CodeMirror Google group](http://groups.google.com/group/codemirror).
+[discuss.CodeMirror forum](http://discuss.codemirror.net).
 
 ## Submitting bug reports
 
@@ -17,7 +17,7 @@ reporting a bug, read these pointers.
 
 **Note:** The issue tracker is for *bugs*, not requests for help. Questions
 should be asked on the
-[CodeMirror Google group](http://groups.google.com/group/codemirror) instead.
+[discuss.CodeMirror forum](http://discuss.codemirror.net) instead.
 
 ### Reporting bugs effectively
 
diff --git a/index.html b/index.html
index 0a9f1338fd05d37c886fe590d8e2b116a85bc2ec..8dcd3783322b97fadae3a07e54beaedb4e1e65d6 100644
--- a/index.html
+++ b/index.html
@@ -165,7 +165,7 @@
   license that CodeMirror uses.</p>
 
   <p>Discussion around the project is done on
-  a <a href="http://groups.google.com/group/codemirror">mailing list</a>.
+  a <a href="http://discuss.codemirror.net">discussion forum</a>.
   There is also
   the <a href="http://groups.google.com/group/codemirror-announce">codemirror-announce</a>
   list, which is only used for major announcements (such as new