diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 4733247d65..b0d4470e4e 100644
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,11 +1,16 @@
+2002-04-12  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+	* insetgraphics.C (prepareFile): fix bug when graphics is a
+	relative path
+
 2002-04-12  Juergen Vigna  <jug@sad.it>
 
 	* insettext.C (insertInset): remove unneeded code!
 
 2002-04-08  Herbert Voss  <voss@perce.de>
 
-       * insetgraphic.C (write): write the rotating angle as
-       a float as is. test only for != 0.0
+	* insetgraphic.C (write): write the rotating angle as
+	a float as is. test only for != 0.0
 
 2002-04-11  Juergen Vigna  <jug@sad.it>
 
diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C
index cb18a563e6..f7848051c9 100644
--- a/src/insets/insetgraphics.C
+++ b/src/insets/insetgraphics.C
@@ -635,7 +635,7 @@ string const InsetGraphics::prepareFile(Buffer const *buf) const
 		return filename_;
 	}
 
-	string const temp = AddName(buf->tmppath, filename_);
+	string const temp = MakeAbsPath(filename_, buf->tmppath);
 	string const outfile_base = RemoveExtension(temp);
 
 	lyxerr[Debug::GRAPHICS] << "tempname = " << temp << "\n";
@@ -644,7 +644,7 @@ string const InsetGraphics::prepareFile(Buffer const *buf) const
 	lyxerr[Debug::GRAPHICS] << "outfile_base = " << outfile_base << endl;
 
 	converters.convert(buf, filename_, outfile_base, from, to);
-	return outfile_base;
+	return RemoveExtension(filename_);
 }