diff --git a/src/frontends/qt4/GuiLog.cpp b/src/frontends/qt4/GuiLog.cpp
index c5007cbf69..dc3326e63c 100644
--- a/src/frontends/qt4/GuiLog.cpp
+++ b/src/frontends/qt4/GuiLog.cpp
@@ -39,7 +39,7 @@ namespace frontend {
 // Information
 QRegExp exprInfo("^(Document Class:|LaTeX Font Info:|File:|Package:|Language:|Underfull|Overfull|\\(|\\\\).*$");
 // Warnings
-QRegExp exprWarning("^(LaTeX Warning|Package \\w+ Warning).*$");
+QRegExp exprWarning("^(LaTeX Warning|LaTeX Font Warning|Package [\\w\\.]+ Warning|Class \\w+ Warning).*$");
 // Errors
 QRegExp exprError("^!.*$");
 
diff --git a/status.16x b/status.16x
index 71cb5ad8ab..d65f400531 100644
--- a/status.16x
+++ b/status.16x
@@ -36,7 +36,7 @@ What's new
 
 * USER INTERFACE
 
-- Fix mouse wheel scrolling on Mac OS 10.6 (bug 6775)
+- Improve the detection of LaTeX warnings in the Log dialog.
 
 
 * DOCUMENTATION AND LOCALIZATION
@@ -67,6 +67,8 @@ What's new
 - Box dialog: only shaded boxes can have multiple paragraphs when there
   is no inner box.
 
+- Fix mouse wheel scrolling on Mac OS 10.6 (bug 6775).
+
 
 * DOCUMENTATION AND LOCALIZATION