diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 79c4a402c..7983b2f9d 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2010-04-07  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org-entities.el (org-entities-user): Fix typo.
+
+	* org.el (org-prepare-agenda-buffers): Uniquify TODO keywords
+
 	* org-entities.el (org-entities-user): Improve docstring.
 
 2010-04-06  Carsten Dominik  <carsten.dominik@gmail.com>
diff --git a/lisp/org-entities.el b/lisp/org-entities.el
index b2afd2d51..95233b5fb 100644
--- a/lisp/org-entities.el
+++ b/lisp/org-entities.el
@@ -66,7 +66,7 @@ utf-8 replacement    Use special character available in utf-8.
 
 If you define new entities here that require specific LaTeX packages to be
 loaded, add these packages to `org-export-latex-packages-alist'."
-  :Group 'org-entities
+  :group 'org-entities
   :type '(repeat
 	  (list
 	   (string :tag "name  ")
diff --git a/lisp/org.el b/lisp/org.el
index d80bb9191..6a663b377 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -14960,6 +14960,8 @@ When a buffer is unmodified, it is just killed.  When modified, it is saved
 		(add-text-properties
 		 (match-beginning 0) (org-end-of-subtree t) pc)))
 	    (set-buffer-modified-p bmp)))))
+    (setq org-todo-keywords-for-agenda
+          (org-uniquify org-todo-keywords-for-agenda))
     (setq org-todo-keyword-alist-for-agenda
 	  (org-uniquify org-todo-keyword-alist-for-agenda)
 	  org-tag-alist-for-agenda (org-uniquify org-tag-alist-for-agenda))))