diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 544f62fe65..e0ce2691a8 100644
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,10 @@
+2001-07-30  Baruch Even  <baruch@lyx.org>
+
+	* insetgraphics.C (decideOutputImageFormat): when doing postscript output
+	convert PNG/GIF/JPG to EPS, assume the rest are EPS already. 
+
+	HACKY! Will need to add an EPS detection routine like old InsetFig does!
+
 2001-07-30  Baruch Even  <baruch@lyx.org>
 
 	* insetgraphics.C: Added EPSI to be an alias of EPS.
diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C
index 7364432116..6333d45e83 100644
--- a/src/insets/insetgraphics.C
+++ b/src/insets/insetgraphics.C
@@ -528,9 +528,11 @@ string decideOutputImageFormat(string const & in_fmt)
 	}
 
 	// If it's postscript, we always do eps.
-	if (in_fmt == "eps" || in_fmt == "epsi")
-		return in_fmt; // eps & epsi are both eps, but different extension.
-	return "eps";
+	// Garst has many eps files with various extensions, we just assume
+	// whatever goes in (except those we know to be otherwise) is eps
+	if (in_fmt == "gif" || in_fmt == "png" || in_fmt == "jpg")
+		return "eps";
+	return in_fmt;
 }
 
 } // Anon. namespace