diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9e775bf92..09db1974d 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,8 @@
 	* org-exp.el (org-export-as-html): Do not turn on the major mode
 	if the buffer will be killed anyway.
 	(org-get-current-options): Exclude the #+TEXT field.
+	(org-export-as-html): Make sure text before the first headline is
+	a paragraph.
 
 	* org-publish.el (org-publish-org-to): Tell the exporter that this
 	buffer will be killed, so it is not necessary to do major mode
diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index 2d3b34518..c5e63f72c 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -2938,6 +2938,8 @@ lang=\"%s\" xml:lang=\"%s\">
       (setq head-count 0)
       (org-init-section-numbers)
 
+      (org-open-par)
+
       (while (setq line (pop lines) origline line)
 	(catch 'nextline