diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 242b89c6e..0c0044ec6 100644
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,8 @@
+Mon Mar 25 17:25:57 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtype.c (g_type_free_instance): Wrap setting freed instance
+	memory to 0xaa in #ifdef G_ENABLE_DEBUG
+
 Thu Mar 21 01:28:14 2002  Tim Janik  <timj@gtk.org>
 
 	* gsignal.[hc]:
diff --git a/gobject/gtype.c b/gobject/gtype.c
index 9bb0b91f9..f419af8ab 100644
--- a/gobject/gtype.c
+++ b/gobject/gtype.c
@@ -1377,7 +1377,9 @@ g_type_free_instance (GTypeInstance *instance)
     }
   
   instance->g_class = NULL;
-  memset (instance, 0xaa, node->data->instance.instance_size);	/* FIXME: debugging hack */
+#ifdef G_ENABLE_DEBUG  
+  memset (instance, 0xaa, node->data->instance.instance_size);	/* debugging hack */
+#endif  
   if (node->data->instance.n_preallocs)
     {
       G_WRITE_LOCK (&type_rw_lock);