diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 51c516fbb..7da09fc38 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -305,6 +305,9 @@ document with ~org-mark-ring-goto~ (default binding =C-c &=).
 
 See docstring for details.
 
+*** ~tags-todo~ custom searches now include DONE keywords
+~tags-todo~ is now equivalent to ~C-c a m~ instead of ~C-c a M~ unless
+you use "/!" markup when filtering TODO keywords.
 *** New option ~org-babel-uppercase-example-markers~
 
 This variable is a ~defcustom~ and replaces the variable
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 8a590ce27..cf9351a9b 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -2826,7 +2826,7 @@ Pressing `<' twice means to restrict to the current subtree or region
 	       ((eq type 'tags)
 		(org-let lprops '(org-tags-view current-prefix-arg org-match)))
 	       ((eq type 'tags-todo)
-		(org-let lprops '(org-tags-view '(4) org-match)))
+		(org-let lprops '(org-tags-view current-prefix-arg org-match)))
 	       ((eq type 'todo)
 		(org-let lprops '(org-todo-list org-match)))
 	       ((eq type 'tags-tree)
@@ -3153,7 +3153,7 @@ s   Search for keywords                 M   Like m, but only TODO entries
 	    '(org-tags-view current-prefix-arg match)))
 	 ((eq type 'tags-todo)
 	  (org-let2 gprops lprops
-	    '(org-tags-view '(4) match)))
+	    '(org-tags-view current-prefix-arg match)))
 	 ((eq type 'todo)
 	  (org-let2 gprops lprops
 	    '(org-todo-list match)))