diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog
index 846343e3c..f679428a8 100644
--- a/gmodule/ChangeLog
+++ b/gmodule/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-07  Matthias Clasen  <mclasen@redhat.com>
+
+	Merged from trunk:
+
+	* gmodule.c (g_module_open): Don't fail to load modules
+	with suffix .la.  (#480122, Andrey Tsyvarev)
+
 2007-11-24  Matthias Clasen  <mclasen@redhat.com>
 
 	* === Released 2.14.4 ===
diff --git a/gmodule/gmodule.c b/gmodule/gmodule.c
index 0bc6a68fb..d5d104ca7 100644
--- a/gmodule/gmodule.c
+++ b/gmodule/gmodule.c
@@ -427,8 +427,11 @@ g_module_open (const gchar    *file_name,
 	  gchar *real_name = parse_libtool_archive (name);
 
 	  /* real_name might be NULL, but then module error is already set */
-	  g_free (name);
-	  name = real_name;
+          if (real_name)
+            {
+	      g_free (name);
+	      name = real_name;
+            }
 	}
       if (name)
 	handle = _g_module_open (name, (flags & G_MODULE_BIND_LAZY) != 0,