diff --git a/ChangeLog b/ChangeLog
index dc2a411dca..e75713e8b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkmodules.c (find_module): Revert the local binding
+	change to avoid a11y regressions in current OpenOffice.org
+	releases. The G_MODULE_BIND_LOCAL will be reintroduced 
+	in 2.12.
+
 2006-08-17  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtktrayicon-x11.c: Fix the ClientMessages we are
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index dc2a411dca..e75713e8b6 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2006-08-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkmodules.c (find_module): Revert the local binding
+	change to avoid a11y regressions in current OpenOffice.org
+	releases. The G_MODULE_BIND_LOCAL will be reintroduced 
+	in 2.12.
+
 2006-08-17  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtktrayicon-x11.c: Fix the ClientMessages we are
diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c
index 359cd8b678..33020f72fb 100644
--- a/gtk/gtkmodules.c
+++ b/gtk/gtkmodules.c
@@ -236,7 +236,7 @@ find_module (const gchar *name)
       module_name = g_module_build_path (NULL, name);
     }
 
-  module = g_module_open (module_name, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
+  module = g_module_open (module_name, G_MODULE_BIND_LAZY);
   g_free(module_name);
 
   return module;