diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 914fbb013..c7c4c0966 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2010-04-27  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org-list.el (org-end-of-item-text-before-children): Also do
+	the right thing at the end of a file.
+
 	* org.el (org-set-packages-alist, org-get-packages-alist): New
 	function.
 	(org-export-latex-default-packages-alist)
diff --git a/lisp/org-list.el b/lisp/org-list.el
index 34deff5ee..6f2205636 100644
--- a/lisp/org-list.el
+++ b/lisp/org-list.el
@@ -605,8 +605,9 @@ Assumes that the cursor is in the first ine of an item."
    (min (save-excursion (org-end-of-item) (point))
 	(save-excursion
 	  (goto-char (point-at-eol))
-	  (re-search-forward (concat "^" (org-item-re t)) nil t)
-	  (match-beginning 0)))))
+	  (if (re-search-forward (concat "^" (org-item-re t)) nil 'move)
+	      (match-beginning 0)
+	    (point-max))))))
 
 (defun org-next-item ()
   "Move to the beginning of the next item in the current plain list.