diff --git a/ChangeLog b/ChangeLog
index 033b51bf..91629ef7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,13 @@
 
 	Patch from Joe Markus Clarke:	
 	
+	* glib/dbus-gidl.c (property_info_unref, arg_info_unref): Fix
+	use-after-free.
+
+2005-08-01  Colin Walters  <walters@verbum.org>
+	
+	Patch from Joe Markus Clarke:	
+	
 	* tools/dbus-send.c (main): 
 	
 	Don't use C99 style initializers (bug #3933).
diff --git a/glib/dbus-gidl.c b/glib/dbus-gidl.c
index e04b9f46..619e25fd 100644
--- a/glib/dbus-gidl.c
+++ b/glib/dbus-gidl.c
@@ -662,8 +662,8 @@ property_info_unref (PropertyInfo *info)
   info->base.refcount -= 1;
   if (info->base.refcount == 0)
     {
-      base_info_free (info);
       g_free (info->type);
+      base_info_free (info);
     }
 }
 
@@ -722,8 +722,8 @@ arg_info_unref (ArgInfo *info)
   if (info->base.refcount == 0)
     {
       g_hash_table_destroy (info->annotations);
-      base_info_free (info);
       g_free (info->type);
+      base_info_free (info);
     }
 }