diff --git a/lib/lyx2lyx/ChangeLog b/lib/lyx2lyx/ChangeLog
index 2d39d4c78e..7c8c3d8494 100644
--- a/lib/lyx2lyx/ChangeLog
+++ b/lib/lyx2lyx/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-29  José Matos  <jamatos@lyx.org>
+
+	* lyx_1_4.py (remove_paperpackage): Take into account the lines
+	added to preamble.
+
 2005-07-29  José Matos  <jamatos@lyx.org>
 
 	* lyx_1_4.py: Fix a4 package removal when the preamble is already there.
diff --git a/lib/lyx2lyx/lyx_1_4.py b/lib/lyx2lyx/lyx_1_4.py
index 1ee3d76ca5..c38ac34028 100644
--- a/lib/lyx2lyx/lyx_1_4.py
+++ b/lib/lyx2lyx/lyx_1_4.py
@@ -1882,9 +1882,12 @@ def remove_paperpackage(file):
             j = len(file.header) - 2
             file.header[j:j]=["\\begin_preamble",
                               conv[paperpackage],"\\end_preamble"]
+            i = i + 3
         else:
             file.header[j+1:j+1] = [conv[paperpackage]]
+            i = i + 1
 
+    print i, file.header[i]
     del file.header[i]
 
     i = find_token(file.header, '\\papersize', 0)