diff --git a/ChangeLog b/ChangeLog
index 834c4f9620..0c8c961cdc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 25 21:55:17 2003  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtkoptionmenu.c (gtk_option_menu_position): account for RTL
+	code.
+
 2003-02-24  Sven Neumann  <sven@gimp.org>
 
         * gtk/gtkmain.c (gtk_get_default_language): fixed documentation.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 834c4f9620..0c8c961cdc 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Tue Feb 25 21:55:17 2003  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtkoptionmenu.c (gtk_option_menu_position): account for RTL
+	code.
+
 2003-02-24  Sven Neumann  <sven@gimp.org>
 
         * gtk/gtkmain.c (gtk_get_default_language): fixed documentation.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 834c4f9620..0c8c961cdc 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Tue Feb 25 21:55:17 2003  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtkoptionmenu.c (gtk_option_menu_position): account for RTL
+	code.
+
 2003-02-24  Sven Neumann  <sven@gimp.org>
 
         * gtk/gtkmain.c (gtk_get_default_language): fixed documentation.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 834c4f9620..0c8c961cdc 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Tue Feb 25 21:55:17 2003  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtkoptionmenu.c (gtk_option_menu_position): account for RTL
+	code.
+
 2003-02-24  Sven Neumann  <sven@gimp.org>
 
         * gtk/gtkmain.c (gtk_get_default_language): fixed documentation.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 834c4f9620..0c8c961cdc 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Tue Feb 25 21:55:17 2003  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtkoptionmenu.c (gtk_option_menu_position): account for RTL
+	code.
+
 2003-02-24  Sven Neumann  <sven@gimp.org>
 
         * gtk/gtkmain.c (gtk_get_default_language): fixed documentation.
diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c
index b7ee5bcbb9..c4e80f7b19 100644
--- a/gtk/gtkoptionmenu.c
+++ b/gtk/gtkoptionmenu.c
@@ -952,6 +952,10 @@ gtk_option_menu_position (GtkMenu  *menu,
       children = children->next;
     }
 
+  if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+    menu_xpos = menu_xpos + widget->allocation.width - menu_width;
+
+  /* Clamp the position on screen */
   screen_width = gdk_screen_get_width (gtk_widget_get_screen (widget));
   
   if (menu_xpos < 0)