diff --git a/doc/org.texi b/doc/org.texi
index a610caf22..d066114c9 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -12534,6 +12534,8 @@ chapter about publishing.
 @i{J@"urgen Vollmer} contributed code generating the table of contents
 in HTML output.
 @item
+@i{Samuel Wales} has provided important feedback and bug reports.
+@item
 @i{Chris Wallace} provided a patch implementing the @samp{QUOTE}
 keyword.
 @item
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c38b5827c..1b2afaebb 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2010-01-14  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org.el (org-entry-properties): Don't match wrong-case TODO
+	keywords.
+
 	* org-agenda.el (org-agenda-schedule, org-agenda-deadline):
 	Document that ARG is passed through to remove the date.
 	(org-agenda-bulk-action): Accept prefix arg and pass it on.  Do
diff --git a/lisp/org.el b/lisp/org.el
index 91a5ff390..7e039be63 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -12516,6 +12516,7 @@ things up because then unnecessary parsing is avoided."
   (org-with-point-at pom
     (let ((clockstr (substring org-clock-string 0 -1))
 	  (excluded '("TODO" "TAGS" "ALLTAGS" "PRIORITY"))
+	  (case-fold-search nil)
 	  beg end range props sum-props key value string clocksum)
       (save-excursion
 	(when (condition-case nil