diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b3a7b5ae9..20298177e 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-12-03  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org-list.el (org-list-parse-list): Leave empty lines after the
+	list, don't consider them as part of the list.
+
 	* org-mobile.el (org-mobile-sumo-agenda-command): Allow tagstodo
 	searches.
 
diff --git a/lisp/org-list.el b/lisp/org-list.el
index ef9bcdfe7..edd612a36 100644
--- a/lisp/org-list.el
+++ b/lisp/org-list.el
@@ -1083,7 +1083,10 @@ Return a list containing first level items as strings and
 sublevels as a list of strings."
   (let* ((item-beginning (org-list-item-beginning))
 	 (start (car item-beginning))
-	 (end (org-list-end (cdr item-beginning)))
+	 (end (save-excursion
+		(goto-char (org-list-end (cdr item-beginning)))
+		(org-back-over-empty-lines)
+		(point)))
 	 output itemsep ltype)
     (while (re-search-forward org-list-beginning-re end t)
       (goto-char (match-beginning 3))