diff --git a/ChangeLog b/ChangeLog
index c4d8f65fd7..3b48967b83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct 16 15:12:26 2001  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtkoptionmenu.c (gtk_option_menu_mnemonic_activate): add a
+	mnemonic_activate function to option menu.
+
 2001-10-15  Murray Cumming <murrayc@usa.net
 
 	* gtk/gtkinputdialog.c, gtk/gtktoolbar.c,  gtk/gtkwidget.c:
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index c4d8f65fd7..3b48967b83 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Tue Oct 16 15:12:26 2001  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtkoptionmenu.c (gtk_option_menu_mnemonic_activate): add a
+	mnemonic_activate function to option menu.
+
 2001-10-15  Murray Cumming <murrayc@usa.net
 
 	* gtk/gtkinputdialog.c, gtk/gtktoolbar.c,  gtk/gtkwidget.c:
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c4d8f65fd7..3b48967b83 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Tue Oct 16 15:12:26 2001  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtkoptionmenu.c (gtk_option_menu_mnemonic_activate): add a
+	mnemonic_activate function to option menu.
+
 2001-10-15  Murray Cumming <murrayc@usa.net
 
 	* gtk/gtkinputdialog.c, gtk/gtktoolbar.c,  gtk/gtkwidget.c:
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index c4d8f65fd7..3b48967b83 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Tue Oct 16 15:12:26 2001  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtkoptionmenu.c (gtk_option_menu_mnemonic_activate): add a
+	mnemonic_activate function to option menu.
+
 2001-10-15  Murray Cumming <murrayc@usa.net
 
 	* gtk/gtkinputdialog.c, gtk/gtktoolbar.c,  gtk/gtkwidget.c:
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c4d8f65fd7..3b48967b83 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Tue Oct 16 15:12:26 2001  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtkoptionmenu.c (gtk_option_menu_mnemonic_activate): add a
+	mnemonic_activate function to option menu.
+
 2001-10-15  Murray Cumming <murrayc@usa.net
 
 	* gtk/gtkinputdialog.c, gtk/gtktoolbar.c,  gtk/gtkwidget.c:
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c4d8f65fd7..3b48967b83 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Tue Oct 16 15:12:26 2001  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtkoptionmenu.c (gtk_option_menu_mnemonic_activate): add a
+	mnemonic_activate function to option menu.
+
 2001-10-15  Murray Cumming <murrayc@usa.net
 
 	* gtk/gtkinputdialog.c, gtk/gtktoolbar.c,  gtk/gtkwidget.c:
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c4d8f65fd7..3b48967b83 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Tue Oct 16 15:12:26 2001  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtkoptionmenu.c (gtk_option_menu_mnemonic_activate): add a
+	mnemonic_activate function to option menu.
+
 2001-10-15  Murray Cumming <murrayc@usa.net
 
 	* gtk/gtkinputdialog.c, gtk/gtktoolbar.c,  gtk/gtkwidget.c:
diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c
index 6e8f10e856..6d284a3f30 100644
--- a/gtk/gtkoptionmenu.c
+++ b/gtk/gtkoptionmenu.c
@@ -79,6 +79,8 @@ static void gtk_option_menu_position        (GtkMenu            *menu,
 					     gpointer            user_data);
 static void gtk_option_menu_show_all        (GtkWidget          *widget);
 static void gtk_option_menu_hide_all        (GtkWidget          *widget);
+static gboolean gtk_option_menu_mnemonic_activate (GtkWidget    *widget,
+						   gboolean      group_cycling);
 static GtkType gtk_option_menu_child_type   (GtkContainer       *container);
 static gint gtk_option_menu_scroll_event    (GtkWidget          *widget,
 					     GdkEventScroll     *event);
@@ -152,6 +154,7 @@ gtk_option_menu_class_init (GtkOptionMenuClass *class)
   widget_class->scroll_event = gtk_option_menu_scroll_event;
   widget_class->show_all = gtk_option_menu_show_all;
   widget_class->hide_all = gtk_option_menu_hide_all;
+  widget_class->mnemonic_activate = gtk_option_menu_mnemonic_activate;
 
   container_class->child_type = gtk_option_menu_child_type;
 
@@ -886,6 +889,14 @@ gtk_option_menu_hide_all (GtkWidget *widget)
   gtk_container_foreach (container, (GtkCallback) gtk_widget_hide_all, NULL);
 }
 
+static gboolean
+gtk_option_menu_mnemonic_activate (GtkWidget *widget,
+				   gboolean   group_cycling)
+{
+  gtk_widget_grab_focus (widget);
+  return TRUE;
+}
+
 static gint
 gtk_option_menu_scroll_event (GtkWidget          *widget,
 			      GdkEventScroll     *event)