diff --git a/lib/ChangeLog b/lib/ChangeLog
index e83bb882d0..374eb98a41 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-23  Dekel Tsur  <dekelts@tau.ac.il>
+
+	* kbd/koi8-u.kmap: Fix crash when using the map.
+
 2002-10-23  Gady Kozma  <gadykozma@yahoo.com>
 
 	* examples/he_example_raw.lyx:
diff --git a/src/ChangeLog b/src/ChangeLog
index 022b6fbeae..32c0cadb98 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-24  Dekel Tsur  <dekelts@tau.ac.il>
+
+	* paragraph.C (TeXOnePar): Fix bug with language changes in nested
+	environment.
+
 2002-10-14  Juergen Vigna  <jug@sad.it>
 
 	* undo_funcs.C (textHandleUndo): alter the order in which the
diff --git a/src/paragraph.C b/src/paragraph.C
index edb0229dc9..022ee6c34b 100644
--- a/src/paragraph.C
+++ b/src/paragraph.C
@@ -1311,8 +1311,10 @@ Paragraph * Paragraph::TeXOnePar(Buffer const * buf,
 	if (language->babel() != previous_language->babel()
 	    // check if we already put language command in TeXEnvironment()
 	    && !(style.isEnvironment()
-		 && (!previous() || previous()->layout() != layout() ||
-			 previous()->params().depth() != params().depth())))
+		 && (!previous() ||
+		     (previous()->layout() != layout() &&
+		      previous()->getDepth() <= getDepth())
+		     || previous()->getDepth() < getDepth())))
 	{
 		if (!lyxrc.language_command_end.empty() &&
 		    previous_language->babel() != doc_language->babel())
diff --git a/status.12x b/status.12x
index b9a4245afa..48ea8d68b2 100644
--- a/status.12x
+++ b/status.12x
@@ -39,6 +39,10 @@ What's new
 
 ** Bug fixes
 
+- fix bug with language changes in nested environment
+
+- fix crash when using koi8-u keymap
+
 - fix bug where special characters in equations label confuse LyX
   (this was a new bug in 1.2.1)