diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0af8bf191..4e8e6548d 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2008-12-19  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org.el (org-scan-tags): Rescan for tags, to get the correct
+	upcase/downcase stuff.  This slows things down for now, but it
+	works.
+
 	* org-export-latex.el (org-export-latex-links): Fix bug with
 	undefined label.
 
diff --git a/lisp/org.el b/lisp/org.el
index aeda46b98..6cd6b29e9 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -9210,7 +9210,7 @@ only lines with a TODO keyword are included in the output."
 			  (if org-tags-match-list-sublevels
 			      (make-string (1- level) ?.) "")
 			  (org-get-heading))
-			 category tags-list)
+			 category (org-get-tags-at))
 		    priority (org-get-priority txt))
 	      (goto-char lspos)
 	      (setq marker (org-agenda-new-marker))