3 files changed, 6 insertions, 4 deletions
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 070d1223e2c..0467907ec94 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -286,10 +286,10 @@ If you want to modify the group buffer, you can use this hook."
   :type 'hook)
 
 (defcustom gnus-useful-groups
-  '(("(ding) mailing list mirrored at gmane.org"
+  '(("(ding) mailing list mirrored at gmane.io"
      "gmane.emacs.gnus.general"
      (nntp "Gmane"
-	   (nntp-address "news.gmane.org")))
+           (nntp-address "news.gmane.io")))
     ("Gnus bug archive"
      "gnus.gnus-bug"
      (nntp "news.gnus.org"
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 9992f46bbd5..3b25d3e2c07 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -120,7 +120,7 @@ The server has to support NOV for any of this to work.
 
 This feature can seriously impact performance it ignores all
 locally cached header entries.  Setting it to t for groups for a
-server that doesn't expire articles (such as news.gmane.org),
+server that doesn't expire articles (such as news.gmane.io),
 leads to very slow summary generation."
   :group 'gnus-thread
   :type '(choice (const :tag "off" nil)
diff --git a/lisp/gnus/spam-report.el b/lisp/gnus/spam-report.el
index 9f1ec7e3677..8435d2d0124 100644
--- a/lisp/gnus/spam-report.el
+++ b/lisp/gnus/spam-report.el
@@ -49,7 +49,7 @@ instead."
   "Whether the article number (faster!) or the header should be used.
 
 You must set this to nil if you don't read Gmane groups directly
-from news.gmane.org, e.g. when using local newsserver such as
+from news.gmane.io, e.g. when using local newsserver such as
 leafnode."
   :type 'boolean)
 
@@ -149,6 +149,8 @@ submitted at once.  Internal variable.")
   (when (and gnus-newsgroup-name
 	     (or (null spam-report-gmane-regex)
 		 (string-match spam-report-gmane-regex gnus-newsgroup-name)))
+    ;; FIXME: These addresses are down.  There is also no
+    ;;        unspam.gmane.io or spam.gmane.io.
     (let ((rpt-host (if unspam "unspam.gmane.org" "spam.gmane.org")))
       (gnus-message 6 "Reporting article %d to %s..." article rpt-host)
       (cond