diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fa5703ae5..f4800f05c 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-24  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org-table.el (org-table-justify-field-maybe): Make sure that
+	inserting a value does not turn a line into a hline.
+
 2010-04-23  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org-clock.el (org-clock-sum): New argument HEADLINE-FILTER.
diff --git a/lisp/org-table.el b/lisp/org-table.el
index c2df70626..430975986 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -830,6 +830,7 @@ Optional argument NEW may specify text to replace the current field content."
 		  (if (<= (length new) l)      ;; FIXME: length -> str-width?
 		      (setq n (format f new))
 		    (setq n (concat new "|") org-table-may-need-update t)))
+	      (if (equal (string-to-char n) ?-) (setq n (concat " " n)))
 	      (or (equal n o)
 		  (let (org-table-may-need-update)
 		    (replace-match n t t))))