diff --git a/ChangeLog b/ChangeLog
index b9a1972cfc..1db1a3faf0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-06-27  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
+	* src/lyxrc.C (read): make sure the .kmap files exist when a keymap
+	is specified (adapted from a patch from edscott <edscott@imp.mx>).
+
 	* Makefile.am (bindist): new target.
 
 	* INSTALL: add instructions for doing a binary distribution.
diff --git a/src/lyxrc.C b/src/lyxrc.C
index f69f2418b9..c816f69a38 100644
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -471,15 +471,23 @@ int LyXRC::read(string const & filename)
 			break;
 			
 		case RC_KBMAP_PRIMARY:
-			if (lexrc.next())
-				primary_kbmap = lexrc.GetString();
+			if (lexrc.next()) 
+				if (!LibFileSearch("kbd", lexrc.GetString(), 
+						   "kmap").empty()) 
+					primary_kbmap = lexrc.GetString();
+				else 
+					lexrc.printError("LyX: Keymap `$$Token' not found");
 			break;
 			
 		case RC_KBMAP_SECONDARY:
-			if (lexrc.next())
-				secondary_kbmap = lexrc.GetString();
+			if (lexrc.next()) 
+				if (!LibFileSearch("kbd", lexrc.GetString(), 
+						   "kmap").empty()) 
+					secondary_kbmap = lexrc.GetString();
+				else 
+					lexrc.printError("LyX: Keymap `$$Token' not found");
 			break;
-			
+						
 		case RC_FONT_ENCODING:
 			if (lexrc.next())
 				fontenc = lexrc.GetString();