diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 19a2cc1cf..8ce8c03e0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2010-05-12  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org.el (org-set-startup-visibility): Fix empty line display.
+
 	* org-latex.el (org-export-latex-links): Use the formatting
 	function of the link type, if it is available.
 
diff --git a/lisp/org.el b/lisp/org.el
index 3f047b440..8dc806d6f 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -5601,7 +5601,7 @@ With a numeric prefix, show all headlines up to that level."
     (org-set-visibility-according-to-property 'no-cleanup)
     (org-cycle-hide-archived-subtrees 'all)
     (org-cycle-hide-drawers 'all)
-    (org-cycle-show-empty-lines 'all)))
+    (org-cycle-show-empty-lines t)))
 
 (defun org-set-visibility-according-to-property (&optional no-cleanup)
   "Switch subtree visibilities according to :VISIBILITY: property."