diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 21d4290a1..fbb78a8a7 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-27  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org.el (org-map-entries): No longer force
+	`org-tags-match-list-sublevels' to t during a todo-only tags
+	search.
+
 2009-06-26  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org-latex.el (org-export-latex-low-levels): Allow user-defined
diff --git a/lisp/org.el b/lisp/org.el
index bcc199c92..5df462ddf 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -2323,10 +2323,6 @@ the sublevels of a headline matching a tag search often also match
 the same search.  Listing all of them can create very long lists.
 Setting this variable to nil causes subtrees of a match to be skipped.
 
-As a special case, if the tag search is restricted to TODO items, the
-value of this variable is ignored and sublevels are always checked, to
-make sure all corresponding TODO items find their way into the list.
-
 This variable is semi-obsolete and probably should always be true.  It
 is better to limit inheritance to certain tags using the variables
 `org-use-tag-inheritance' and `org-tags-exclude-from-inheritance'."
@@ -11230,7 +11226,7 @@ a *different* entry, you cannot use these techniques."
 	 (org-agenda-skip-comment-trees (memq 'comment skip))
 	 (org-agenda-skip-function
 	  (car (org-delete-all '(comment archive) skip)))
-	 (org-tags-match-list-sublevels t)
+; ?????? (org-tags-match-list-sublevels t)
 	 matcher file res
 	 org-todo-keywords-for-agenda
 	 org-done-keywords-for-agenda