diff --git a/ChangeLog b/ChangeLog
index 485e091aa8..7bedecfe49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2000-10-24  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* lib/kbd/latvian.kmap: new file from Janne Pänkälä (epa@iki.fi)
+
+2000-10-23  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* src/insets/figinset.C (GhostscriptMsg): use DisplayString() to
+	open a new display.
+	(runqueue): ditto.
+
+2000-10-20  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* src/gettext.h (locale_init): and re-add it here.
+
+	* src/main.C (main): remove call to setlocale
+
 2000-10-18  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
 	* src/version.h (LYX_VERSION): reset version to 1.1.5fixcvs
diff --git a/README b/README
index 55c704edfd..b0a02db146 100644
--- a/README
+++ b/README
@@ -159,6 +159,7 @@ Does LyX have support for non-English speakers/writers/readers?
 	Greek
 	Hebrew
 	Hungarian (Magyar)
+	Latvian
 	Polish
 	Portugese
 	Romanian
diff --git a/src/gettext.h b/src/gettext.h
index db7e61e226..fdd2b4b426 100644
--- a/src/gettext.h
+++ b/src/gettext.h
@@ -46,7 +46,7 @@
 
 #  ifdef HAVE_LC_MESSAGES
                                 // LC_TIME, LC_CTYPE, even LC_ALL
-#    define locale_init() { setlocale (LC_MESSAGES, ""); setlocale (LC_CTYPE, "");}
+#    define locale_init() { setlocale (LC_MESSAGES, ""); setlocale (LC_CTYPE, ""); setlocale (LC_NUMERIC, "C");}
 #  else
 #    define locale_init()
 #  endif
diff --git a/src/insets/figinset.C b/src/insets/figinset.C
index f24394db7e..62c3612fad 100644
--- a/src/insets/figinset.C
+++ b/src/insets/figinset.C
@@ -234,7 +234,7 @@ int GhostscriptMsg(FL_OBJECT *, Window, int, int,
 					addpidwait(forkstat);
 					break;
 				} else {  // child
-					tmpdisp = XOpenDisplay(XDisplayName(0));
+					tmpdisp = XOpenDisplay(DisplayString(fl_get_display()));
 					XFlush(tmpdisp);
 				}
 				im = XGetImage(tmpdisp, p->bitmap, 0, 0,
@@ -517,7 +517,7 @@ void runqueue()
 		if (pid == 0) { // child
 			char ** env;
 			int ne = 0;
-			Display * tempdisp = XOpenDisplay(XDisplayName(0));
+			Display * tempdisp = XOpenDisplay(DisplayString(fl_get_display()));
 
 			// create translation file
 			ofstream ofs;
diff --git a/src/main.C b/src/main.C
index 57832f7bc6..e3f9e6159e 100644
--- a/src/main.C
+++ b/src/main.C
@@ -66,7 +66,6 @@ int main(int argc, char * argv[])
 	
 	// initialize for internationalized version *EK*
 	locale_init();
-	setlocale(LC_NUMERIC, "C");
 	gettext_init();
 
 #ifdef __EMX__