diff --git a/ChangeLog b/ChangeLog
index 032b6a6df1..179035e7d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-26  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkmenu.c (gtk_menu_paint): Pay attention to the
+	scroll offset when drawing the box.  (#308834, Tom von 
+	Schwerdtner)
+
 2005-06-26  Tor Lillqvist  <tml@novell.com>
 
 	* gdk/Makefile.am
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 032b6a6df1..179035e7d5 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-06-26  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkmenu.c (gtk_menu_paint): Pay attention to the
+	scroll offset when drawing the box.  (#308834, Tom von 
+	Schwerdtner)
+
 2005-06-26  Tor Lillqvist  <tml@novell.com>
 
 	* gdk/Makefile.am
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 032b6a6df1..179035e7d5 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2005-06-26  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkmenu.c (gtk_menu_paint): Pay attention to the
+	scroll offset when drawing the box.  (#308834, Tom von 
+	Schwerdtner)
+
 2005-06-26  Tor Lillqvist  <tml@novell.com>
 
 	* gdk/Makefile.am
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index a9c0b4bf4c..a1eae149b3 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -1289,7 +1289,7 @@ gtk_menu_popup (GtkMenu		    *menu,
   GtkMenuPrivate *priv;
 
   g_return_if_fail (GTK_IS_MENU (menu));
-  
+
   widget = GTK_WIDGET (menu);
   menu_shell = GTK_MENU_SHELL (menu);
   priv = gtk_menu_get_private (menu);
@@ -2502,7 +2502,8 @@ gtk_menu_paint (GtkWidget      *widget,
 		     GTK_STATE_NORMAL,
 		     GTK_SHADOW_OUT,
 		     NULL, widget, "menu",
-		     -border_x, -border_y, width, height);
+		     - border_x, menu->scroll_offset - border_y, 
+		     width, height);
     }
 }