diff --git a/src/ChangeLog b/src/ChangeLog
index a8712eaa4f..ea98b1d651 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-19  Dekel Tsur  <dekelts@tau.ac.il>
+
+	* FontLoader.C (available): Check if font is available without
+	loading the font.
+
 2001-09-13  Angus Leeming  <a.leeming@ic.ac.uk>
 
 	* lyxrc.[Ch]: added display_graphics variable and associated code.
diff --git a/src/FontLoader.C b/src/FontLoader.C
index aeaf96c805..273aab3910 100644
--- a/src/FontLoader.C
+++ b/src/FontLoader.C
@@ -325,7 +325,9 @@ bool FontLoader::available(LyXFont const & f)
 {
 	if (!lyxrc.use_gui)
 		return false;
-	load(f.family(), f.series(), f.realShape(), f.size());
+
+	if (!fontinfo[f.family()][f.series()][f.realShape()])
+		getFontinfo(f.family(), f.series(), f.realShape());
 	return fontinfo[f.family()][f.series()][f.realShape()]
 		->getFontname(f.size()).size();
 }