diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 9ac1a8bd..939f8913 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -190,10 +190,10 @@ each attachment handler is logged in buffers with names beginning
 ;;; Options
 
 (defcustom notmuch-show-stash-mlarchive-link-alist
-  '(("Gmane" . "https://mid.gmane.org/")
-    ("MARC" . "https://marc.info/?i=")
+  '(("MARC" . "https://marc.info/?i=")
     ("Mail Archive, The" . "https://mid.mail-archive.com/")
-    ("LKML" . "https://lkml.kernel.org/r/")
+    ("Lore" . "https://lore.kernel.org/r/")
+    ("Notmuch" . "https://nmbug.notmuchmail.org/nmweb/show/")
     ;; FIXME: can these services be searched by `Message-Id' ?
     ;; ("MarkMail" . "http://markmail.org/")
     ;; ("Nabble" . "http://nabble.com/")
@@ -218,7 +218,7 @@ return the ML archive reference URI."
 			     (function :tag "Function returning the URL")))
   :group 'notmuch-show)
 
-(defcustom notmuch-show-stash-mlarchive-link-default "Gmane"
+(defcustom notmuch-show-stash-mlarchive-link-default "MARC"
   "Default Mailing List Archive to use when stashing links.
 
 This is used when `notmuch-show-stash-mlarchive-link' isn't
diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh
index 1967de22..7b70175b 100755
--- a/test/T310-emacs.sh
+++ b/test/T310-emacs.sh
@@ -869,7 +869,7 @@ test_emacs '(notmuch-show "id:\"bought\"")
 	(notmuch-show-stash-message-id-stripped)
 	(notmuch-show-stash-tags)
 	(notmuch-show-stash-filename)
-	(notmuch-show-stash-mlarchive-link "Gmane")
+	(notmuch-show-stash-mlarchive-link "Notmuch")
 	(notmuch-show-stash-mlarchive-link "MARC")
 	(notmuch-show-stash-mlarchive-link "Mail Archive, The")
 	(switch-to-buffer
@@ -890,7 +890,7 @@ id:bought
 bought
 inbox,stashtest
 ${gen_msg_filename}
-https://mid.gmane.org/bought
+https://nmbug.notmuchmail.org/nmweb/show/bought
 https://marc.info/?i=bought
 https://mid.mail-archive.com/bought
 EOF