diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a4ae0f8ce..8c9407dec 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2008-11-03  Carsten Dominik  <dominik@science.uva.nl>
 
+	* org.el (org-insert-heading): If buffer does not end with a
+	newline, add one if necessary to insert headline correctly.
+
 	* org-exp.el (org-export-as-html): Make sure that <hr/> is between
 	paragraphs, not inside.
 
diff --git a/lisp/org.el b/lisp/org.el
index 6a6f9f402..ed0ef3810 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -4648,6 +4648,7 @@ but create the new headline after the current line."
 	    (cond
 	     (org-insert-heading-respect-content
 	      (org-end-of-subtree nil t)
+	      (or (bolp) (newline))
 	      (open-line 1))
 	     ((org-on-heading-p)
 	      (when hide-previous