diff --git a/ChangeLog b/ChangeLog
index dc3faefeb1..a0a0b31674 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-27  Matthias Clasen  <mclasen@redhat.com>
+
+	Bug 339367 – Incorrect spotlocation
+
+	* modules/input/gtkimcontextxim.c: Correct the spot location
+	for on-the-spot style.
+
 2008-09-27  Denis Washington  <denisw@svn.gnome.org>
 
 	* gtk/gtkiconview.c: only draw keyboard focus when keyboard navigation
diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c
index e9d02dd579..a9e584c5ca 100644
--- a/modules/input/gtkimcontextxim.c
+++ b/modules/input/gtkimcontextxim.c
@@ -846,7 +846,7 @@ gtk_im_context_xim_set_cursor_location (GtkIMContext *context,
     return;
 
   spot.x = area->x;
-  spot.y = area->y;
+  spot.y = area->y + area->height;
 
   preedit_attr = XVaCreateNestedList (0,
 				      XNSpotLocation, &spot,