diff --git a/ChangeLog b/ChangeLog
index 49360c333a..16b9e50d4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-26  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilesystem.c (gtk_file_system_module_load): 
+	* gtk/gtkthemes.c (gtk_theme_engine_load): 
+	* gtk/gtkimmodule.c (gtk_im_module_load): Use G_MODULE_BIND_LAZY
+	when dlopening modules.  (#319557, Laszlo Peter)
+
 2005-10-26  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtktextbtree.c (gtk_text_btree_resolve_bidi): Only use text
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 49360c333a..16b9e50d4d 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2005-10-26  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilesystem.c (gtk_file_system_module_load): 
+	* gtk/gtkthemes.c (gtk_theme_engine_load): 
+	* gtk/gtkimmodule.c (gtk_im_module_load): Use G_MODULE_BIND_LAZY
+	when dlopening modules.  (#319557, Laszlo Peter)
+
 2005-10-26  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtktextbtree.c (gtk_text_btree_resolve_bidi): Only use text
diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c
index 268bfad1dd..63101d8c4a 100644
--- a/gtk/gtkfilesystem.c
+++ b/gtk/gtkfilesystem.c
@@ -1075,7 +1075,7 @@ gtk_file_system_module_load (GTypeModule *module)
 {
   GtkFileSystemModule *fs_module = GTK_FILE_SYSTEM_MODULE (module);
   
-  fs_module->library = g_module_open (fs_module->path, 0);
+  fs_module->library = g_module_open (fs_module->path, G_MODULE_BIND_LAZY);
   if (!fs_module->library)
     {
       g_warning (g_module_error());
diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c
index 977ff4bfa5..3d2983a2e2 100644
--- a/gtk/gtkimmodule.c
+++ b/gtk/gtkimmodule.c
@@ -95,7 +95,7 @@ gtk_im_module_load (GTypeModule *module)
 {
   GtkIMModule *im_module = GTK_IM_MODULE (module);
   
-  im_module->library = g_module_open (im_module->path, 0);
+  im_module->library = g_module_open (im_module->path, G_MODULE_BIND_LAZY);
   if (!im_module->library)
     {
       g_warning (g_module_error());
diff --git a/gtk/gtkthemes.c b/gtk/gtkthemes.c
index 1e5e0cc5ae..1362552c68 100644
--- a/gtk/gtkthemes.c
+++ b/gtk/gtkthemes.c
@@ -77,7 +77,7 @@ gtk_theme_engine_load (GTypeModule *module)
   
   GTK_NOTE (MISC, g_message ("Loading Theme %s\n", engine_path));
        
-  engine->library = g_module_open (engine_path, 0);
+  engine->library = g_module_open (engine_path, G_MODULE_BIND_LAZY);
   g_free(engine_path);
   if (!engine->library)
     {