diff --git a/src/LaTeX.cpp b/src/LaTeX.cpp
index 1cbbe2a915..b580242029 100644
--- a/src/LaTeX.cpp
+++ b/src/LaTeX.cpp
@@ -689,7 +689,9 @@ int LaTeX::scanLogFile(TeXErrors & terr)
 				// we have a latex error
 				retval |=  TEX_ERROR;
 				if (contains(desc,
-				    "Package babel Error: You haven't defined the language"))
+				    "Package babel Error: You haven't defined the language") ||
+				    contains(desc,
+				    "Package babel Error: You haven't loaded the option"))
 					retval |= ERROR_RERUN;
 				// get the line number:
 				int line = 0;
diff --git a/status.15x b/status.15x
index 91f47e304b..5c69d09b1e 100644
--- a/status.15x
+++ b/status.15x
@@ -30,7 +30,8 @@ What's new
 
 * DOCUMENT INPUT/OUTPUT
 
-
+- Get rid of annoying LaTeX error after changing the document language
+  (bug 2468)
 
 * USER INTERFACE: