diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b128ae46e..94586b063 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2010-03-23  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org.el (org-insert-heading): Do not remove all spaces if the
+	headline is empty.
+
 	* org-indent.el (org-indent): Fix group name.
 
 2010-03-21  Carsten Dominik  <carsten.dominik@gmail.com>
diff --git a/lisp/org.el b/lisp/org.el
index 60191f5a2..84bec4c48 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -6189,6 +6189,9 @@ This is important for non-interactive uses of the command."
 	      (setq pos (point-at-bol))
 	      (or split (end-of-line 1))
 	      (delete-horizontal-space)
+	      (if (string-match "\\`\\*+\\'"
+				(buffer-substring (point-at-bol) (point)))
+		  (insert " "))
 	      (newline (if blank 2 1))
 	      (when tags
 		(save-excursion