diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7c41d9224..a4ae0f8ce 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2008-11-03  Carsten Dominik  <dominik@science.uva.nl>
 
+	* org-exp.el (org-export-as-html): Make sure that <hr/> is between
+	paragraphs, not inside.
+
 	* org.el (org-todo): Quote
 	`org-agenda-headline-snapshot-before-repeat'.
 
diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index 88147dcbf..4be6b0133 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -3130,7 +3130,9 @@ lang=\"%s\" xml:lang=\"%s\">
 
 	  ;; Horizontal line
 	  (when (string-match "^[ \t]*-\\{5,\\}[ \t]*$" line)
-	    (insert "\n<hr/>\n")
+	    (if org-par-open
+		(insert "\n</p>\n<hr/>\n<p>\n")
+	      (insert "\n<hr/>\n"))
 	    (throw 'nextline nil))
 
 	  ;; Blockquotes and verse