diff --git a/src/ChangeLog b/src/ChangeLog
index 5002861c8a..335b7d2301 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,12 @@
+2006-05-30  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* intl.C (InitKeyMapper): reset kbmap file names if the files
+	could not be read (bug 2604).
+
 2006-05-29  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
-	* LaTeX.C (run): rerun latex im idx file is empty (needed by memoir)
-        fix typo in comment (bug 2623).
+	* LaTeX.C (run): rerun latex if idx file is empty (needed by memoir)
+	fix typo in comment (bug 2623).
 
 	* LaTeXFeatures.C (getPackages): whitespace.
 
diff --git a/src/intl.C b/src/intl.C
index ce237ed1a2..4f01a78264 100644
--- a/src/intl.C
+++ b/src/intl.C
@@ -77,6 +77,12 @@ void Intl::InitKeyMapper(bool on)
 {
 	lyxerr[Debug::INIT] << "Initializing key mappings..." << endl;
 
+	if (trans.SetPrimary(prim_lang) == -1)
+		prim_lang.erase();
+	if (trans.SetSecondary(sec_lang) == -1)
+		sec_lang.erase();
+	trans.setCharset(lyxrc.font_norm);
+
 	if (prim_lang.empty() && sec_lang.empty())
 		keymapon = false;
 	else
@@ -86,8 +92,4 @@ void Intl::InitKeyMapper(bool on)
 
 	if (keymapon)
 		KeyMapPrim();
-
-	trans.SetPrimary(prim_lang);
-	trans.SetSecondary(sec_lang);
-	trans.setCharset(lyxrc.font_norm);
 }
diff --git a/status.14x b/status.14x
index f52ab906bd..a78fca712f 100644
--- a/status.14x
+++ b/status.14x
@@ -113,7 +113,10 @@ What's new
 - Fix display of horizontal fill which appears at the end of a line
   (bug 2508).
 
-- Fix crash when changing document class while the cursor is inside a table
+- Fix crash when changing document class while the cursor is inside a
+  table.
+
+- Fix crash when there is a syntax error in a keyboard map file (bug 2604).
 
 * Configuration/Installation: