diff --git a/lib/ChangeLog b/lib/ChangeLog
index d242fde765..350a67b576 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-03  José Matos  <jamatos@lyx.org>
+
+	* reLyX/MakePreamble.pm(translate_preamble): use a saner method
+	to translate \usepackage from the preamble, fix #1584.
+
 2004-05-03  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
 	* layouts/scrlttr2.layout: include counters.
diff --git a/lib/reLyX/MakePreamble.pm b/lib/reLyX/MakePreamble.pm
index 728973f3d9..e5a1d2906b 100644
--- a/lib/reLyX/MakePreamble.pm
+++ b/lib/reLyX/MakePreamble.pm
@@ -294,7 +294,7 @@ sub translate_preamble {
 
     my $up;
     foreach $up (keys %Usepackage_Table) {
-	$Latex_Preamble =~ s/\\usepackage\{$up\}\s*// && do {
+	$Latex_Preamble =~ s/^\s*\\usepackage\{$up\}\s*// && do {
 	    $LyX_Preamble .= "$Usepackage_Table{$up}";
 	    $LyX_Preamble .= "\n" unless ($Usepackage_Table{$up} eq "");
 	}