diff --git a/ChangeLog b/ChangeLog
index 8d226e994..773423f70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-29  Tommi Komulainen  <tommi.komulainen@iki.fi>
+
+	* clutter/osx/clutter-event.osx.c (NSEvent:clutterKeyVal:): Add
+	comment, on OSX backend the Shift modifier is included in 'keyval'
+	making it identical to 'unicode_value'  Instead of <Shift>a or
+	<Shift>3 you'd get <Shift>A and <Shift>#
+
 2008-06-27  Matthew Allum  <mallum@openedhand.com>
 
 	* clutter/cogl/gl/cogl.c:
diff --git a/clutter/osx/clutter-event-osx.c b/clutter/osx/clutter-event-osx.c
index a622cc4dc..d4afa8230 100644
--- a/clutter/osx/clutter-event-osx.c
+++ b/clutter/osx/clutter-event-osx.c
@@ -106,6 +106,11 @@ static GPollFunc old_poll_func = NULL;
   /* FIXME: doing this right is a lot of work, see gdkkeys-quartz.c in gtk+
    * For now handle some common/simple keys only. Might not work with other
    * hardware than mine (MacBook Pro, finnish layout). Sorry.
+   *
+   * charactersIgnoringModifiers ignores most modifiers, not Shift though.
+   * So, for all Shift-modified keys we'll end up reporting 'keyval' identical
+   * to 'unicode_value'  Instead of <Shift>a or <Shift>3 you'd get <Shift>A
+   * and <Shift>#
    */
   unichar c = [[self charactersIgnoringModifiers] characterAtIndex:0];