diff --git a/lib/ChangeLog b/lib/ChangeLog
index 805ca32eb3..abd7c71a1f 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,22 @@
+2002-07-16  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+	* configure.m4: add formats fig and epsi with converters
+
+2002-06-19 Herbert Voss  <voss@perce.de>
+
+	* configure.m4: add converters for epsi and (x)fig
+	
+2002-07-16  Andrew Zabolotny  <zap@cobra.ru>
+
+	* bind/emacs.bind: 
+	* bind/xemacs.bind: 
+	* bind/sciword.bind: 
+	* bind/cua.bind: include greekkeys and cyrkeys bindings
+
+	* bind/greekkeys.bind:
+	* bind/cyrkeys.bind: bindings to enter cyrillic and greek
+	characters directly from keyboard
+
 2002-07-16  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
 	* bind/menus.bind: cleanup shortcuts for section layouts. Starred
diff --git a/lib/bind/cua.bind b/lib/bind/cua.bind
index 9bad2e0eb9..d602b3e2c2 100644
--- a/lib/bind/cua.bind
+++ b/lib/bind/cua.bind
@@ -177,3 +177,5 @@
 \bind_file menus.bind
 \bind_file math.bind
 \bind_file latinkeys.bind
+\bind_file cyrkeys.bind
+\bind_file greekkeys.bind
diff --git a/lib/bind/emacs.bind b/lib/bind/emacs.bind
index c2e51734d3..b8bbe68b10 100644
--- a/lib/bind/emacs.bind
+++ b/lib/bind/emacs.bind
@@ -224,3 +224,5 @@
 \bind_file menus.bind
 \bind_file math.bind
 \bind_file latinkeys.bind
+\bind_file cyrkeys.bind
+\bind_file greekkeys.bind
diff --git a/lib/bind/sciword.bind b/lib/bind/sciword.bind
index d51a8a5597..8ccada643f 100644
--- a/lib/bind/sciword.bind
+++ b/lib/bind/sciword.bind
@@ -491,3 +491,5 @@
 
 
 \bind_file latinkeys.bind
+\bind_file cyrkeys.bind
+\bind_file greekkeys.bind
diff --git a/lib/bind/xemacs.bind b/lib/bind/xemacs.bind
index 81d1689a25..03aa02538b 100644
--- a/lib/bind/xemacs.bind
+++ b/lib/bind/xemacs.bind
@@ -325,3 +325,5 @@
 \bind_file menus.bind
 \bind_file math.bind
 \bind_file latinkeys.bind
+\bind_file cyrkeys.bind
+\bind_file greekkeys.bind
diff --git a/lib/configure.m4 b/lib/configure.m4
index b567087fe1..d7cee2a939 100644
--- a/lib/configure.m4
+++ b/lib/configure.m4
@@ -414,6 +414,12 @@ case $GRACE in
    done 
 esac
 
+SEARCH_PROG([for an FIG -> EPS/XPM converter], FIG2DEV, fig2dev)
+if test "$FIG2DEV" = "fig2dev"; then
+  fig_to_eps="fig2dev -L eps \$\$i \$\$o"
+  fig_to_xpm="fig2dev -L xpm \$\$i \$\$o"
+fi
+
 #### Explore the LaTeX configuration
 MSG_CHECKING(LaTeX configuration)
 # First, remove the files that we want to re-create
@@ -492,6 +498,7 @@ cat >$outfile <<EOF
 \\Format eps	  eps	EPS		""
 \\Format epsi     epsi  EPSI		""
 \\Format fax	  ""	Fax		""
+\\Format fig	  fig	XFig		""
 \\Format fits     fits	FITS		""
 \\Format gif      gif	GIF		""
 \\Format agr      agr	GRACE		""
@@ -540,6 +547,7 @@ cat >$outfile <<EOF
 
 \\converter bmp  eps "$bmp_to_eps" ""
 \\converter fits  eps "$fits_to_eps" ""
+\\converter fig  eps "$fig_to_eps" ""
 \\converter gif  eps "$gif_to_eps" ""
 \\converter jpg  eps "$jpg_to_eps" ""
 \\converter pbm  eps "$pbm_to_eps" ""
@@ -562,6 +570,7 @@ cat >$outfile <<EOF
 \\converter epsi png "$eps_to_png" ""
 \\converter jpg  png "$jpg_to_png" ""
 
+\\converter fig  xpm "$fig_to_xpm" ""
 \\converter gif  xpm "$gif_to_xpm" ""
 \\converter eps  xpm "$eps_to_xpm" ""
 \\converter epsi xpm "$eps_to_xpm" ""
diff --git a/src/support/ChangeLog b/src/support/ChangeLog
index 598264d1d2..12e822f116 100644
--- a/src/support/ChangeLog
+++ b/src/support/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-20  Herbert Voss  <voss@perce.de>
+
+	* filetools.[C]: (readExtFromCOntents) add support for
+	(x)fig format images
+		
 2002-07-15  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
 	* filetools.C (IsLyXFilename):
diff --git a/src/support/filetools.C b/src/support/filetools.C
index 0a8710ba8b..1f331580fa 100644
--- a/src/support/filetools.C
+++ b/src/support/filetools.C
@@ -992,6 +992,7 @@ string const GetExtension(string const & name)
 // AGR	Grace...
 // BMP	BM...
 // EPS	%!PS-Adobe-3.0 EPSF...
+// FIG	#FIG...
 // FITS ...BITPIX...
 // GIF	GIF...
 // JPG	JFIF
@@ -1052,10 +1053,6 @@ string const getExtFromContents(string const & filename)
 		}
 
 		getline(ifs, str);
-
-		lyxerr[Debug::GRAPHICS] << "Scanstring: " << str.substr(0,60)
-					<< endl;
-
 		string const stamp = str.substr(0,2);
 		if (firstLine && str.size() >= 2) {
 			// at first we check for a zipped file, because this
@@ -1103,6 +1100,9 @@ string const getExtFromContents(string const & filename)
 			} else if (prefixIs(str,"%TGIF")) {
 				format =  "tgif";
 
+			} else if (prefixIs(str,"#FIG")) {
+				format =  "fig";
+
 			} else if (prefixIs(str,"GIF")) {
 				format =  "gif";