diff --git a/lib/lyx2lyx/ChangeLog b/lib/lyx2lyx/ChangeLog
index 708609d036..724013af47 100644
--- a/lib/lyx2lyx/ChangeLog
+++ b/lib/lyx2lyx/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-06  José Matos  <jamatos@lyx.org>
+
+	* lyx_1_4.py (convert_breaks): put all paragraph parameters into a single line.
+
 2005-05-04  José Matos  <jamatos@lyx.org>
 
 	* LyX.py: fix allowed parameters for paragraphs.
diff --git a/lib/lyx2lyx/lyx_1_4.py b/lib/lyx2lyx/lyx_1_4.py
index 7491dcad53..eb0c91edba 100644
--- a/lib/lyx2lyx/lyx_1_4.py
+++ b/lib/lyx2lyx/lyx_1_4.py
@@ -524,6 +524,12 @@ def convert_breaks(file):
         if i == -1:
             return
         i = i + 1
+
+        # Merge all paragraph parameters into a single line
+        while file.body[i + 1][:1] == '\\':
+            file.body[i] = file.body[i + 1] + ' ' + file.body[i]
+            del file.body[i+1]
+
         line_top   = find(file.body[i],"\\line_top")
         line_bot   = find(file.body[i],"\\line_bottom")
         pb_top     = find(file.body[i],"\\pagebreak_top")