diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog
index fb3050cdb..683d555a1 100644
--- a/gmodule/ChangeLog
+++ b/gmodule/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-09  Matthias Clasen  <mclasen@redhat.com>
+
+	* gmodule.c (g_module_open): Include the module file 
+	name to the error message given when module initialization 
+	fails.  (#448484, Gustavo Carneiro)
+
 Fri Jun 29 2007  Matthias Clasen  <mclasen@redhat.com>
 
 	* === Released 2.13.6 ===
diff --git a/gmodule/gmodule.c b/gmodule/gmodule.c
index be00e53aa..0bc6a68fb 100644
--- a/gmodule/gmodule.c
+++ b/gmodule/gmodule.c
@@ -488,7 +488,10 @@ g_module_open (const gchar    *file_name,
 	{
 	  gchar *error;
 
-	  error = g_strconcat ("GModule initialization check failed: ", check_failed, NULL);
+	  error = g_strconcat ("GModule (", 
+                               file_name ? file_name : "NULL", 
+                               ") initialization check failed: ", 
+                               check_failed, NULL);
 	  g_module_close (module);
 	  module = NULL;
 	  g_module_set_error (error);