diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 670d474be8..8af86efeef 100644
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-13  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* QContentPane.C (q_key_state): allow both Alt and Meta as alt
+	modifier. 
+
 2006-06-30  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
 	* ui/QPrefUIModule.ui: fix layout.
diff --git a/src/frontends/qt2/QContentPane.C b/src/frontends/qt2/QContentPane.C
index 0aab79503f..08064719c5 100644
--- a/src/frontends/qt2/QContentPane.C
+++ b/src/frontends/qt2/QContentPane.C
@@ -32,7 +32,7 @@ key_modifier::state q_key_state(Qt::ButtonState state)
 		k |= key_modifier::ctrl;
 	if (state & Qt::ShiftButton)
 		k |= key_modifier::shift;
-	if (state & Qt::AltButton)
+	if (state & Qt::AltButton || state & Qt::MetaButton)
 		k |= key_modifier::alt;
 	return k;
 }
diff --git a/status.14x b/status.14x
index 223cb1d6b7..fd52a503ad 100644
--- a/status.14x
+++ b/status.14x
@@ -17,3 +17,11 @@ order of importance. This is, of course, subjective...]
 What's new
 ==========
 
+** Updates:
+
+
+** Bug fixes:
+
+* Miscellaneous
+
+- Handle the Meta keyboard modifier as Alt (Qt only).