diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 34605cf98..6fd7d497f 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-08-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org.el (org-remove-timestamp-with-keyword): Only remove in
+	entry, not in subtree.
+
 	* org-src.el (org-src-lang-modes): Add abbreviation elisp for
 	emacs lisp.
 
diff --git a/lisp/org.el b/lisp/org.el
index 735029c2e..a5181abc8 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -10045,7 +10045,7 @@ nil."
     (save-excursion
       (org-back-to-heading t)
       (setq beg (point))
-      (org-end-of-subtree t t)
+      (outline-next-heading)
       (while (re-search-backward re beg t)
 	(replace-match "")
 	(if (and (string-match "\\S-" (buffer-substring (point-at-bol) (point)))