diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 99d5ad7b2..2cdc5b02e 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2009-06-08  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org-docbook.el (org-export-docbook-close-lists-maybe): Also look
+	at normal indentation.
+
+	* org-html.el (org-export-html-close-lists-maybe): Also look at
+	normal indentation.
+
 	* org-remember.el (org-remember-handler): Abort remember if the
 	buffer is empty.
 
diff --git a/lisp/org-docbook.el b/lisp/org-docbook.el
index eb37e3d3c..a227537ec 100644
--- a/lisp/org-docbook.el
+++ b/lisp/org-docbook.el
@@ -1151,7 +1151,8 @@ publishing directory."
 (defvar local-list-indent)
 (defvar local-list-type)
 (defun org-export-docbook-close-lists-maybe (line)
-  (let ((ind (get-text-property 0 'original-indentation line))
+  (let ((ind (or (get-text-property 0 'original-indentation line)
+		 (org-get-indentation line)))
 	didclose)
     (when ind
       (while (and in-local-list
diff --git a/lisp/org-html.el b/lisp/org-html.el
index d0a406385..9390af7e9 100644
--- a/lisp/org-html.el
+++ b/lisp/org-html.el
@@ -1872,7 +1872,8 @@ If there are links in the string, don't modify these."
 (defvar local-list-indent)
 (defvar local-list-type)
 (defun org-export-html-close-lists-maybe (line)
-  (let ((ind (get-text-property 0 'original-indentation line))
+  (let ((ind (or (get-text-property 0 'original-indentation line)
+		 (org-get-indentation line)))
 	didclose)
     (when ind
       (while (and in-local-list