diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7d86bbcbe..133db2b29 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-20  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org.el (org-entry-properties): Add TIMESTAMP properties back
+	in.
+
 2009-12-18  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org.el (org-all-time-keywords): New variable.
diff --git a/lisp/org.el b/lisp/org.el
index 93a194b79..27af308e7 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -12497,7 +12497,9 @@ things up because then unnecessary parsing is avoided."
 		    props))
 	    (when (or (not specific) (string= specific "TAGS"))
 	      (push (cons "BLOCKED" (if (org-entry-blocked-p) "t" "")) props))
-	    (when (or (not specific) (member specific org-all-time-keywords)) 
+	    (when (or (not specific)
+		      (member specific org-all-time-keywords)
+		      (member specific '("TIMESTAMP" "TIMESTAMP_IA")))
 	      (while (re-search-forward org-maybe-keyword-time-regexp end t)
 		(setq key (if (match-end 1) (substring (org-match-string-no-properties 1) 0 -1))
 		      string (if (equal key clockstr)