diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 6b168872c..9e6bd3bb1 100644
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-18  Matthias Clasen  <mclasen@redhat.com>
+
+	* gobject.h: Make g_object_compat_control() visible
+	for GTK+ compilation, to avoid segfaults on 64bit
+	platforms.
+
 2006-01-03  Matthias Clasen  <mclasen@redhat.com>
 
 	* === Released 2.8.5 ===
diff --git a/gobject/gobject.h b/gobject/gobject.h
index 4270a72b7..e89c6ada3 100644
--- a/gobject/gobject.h
+++ b/gobject/gobject.h
@@ -240,6 +240,9 @@ void        g_value_take_object               (GValue         *value,
 #ifndef G_DISABLE_DEPRECATED
 void        g_value_set_object_take_ownership (GValue         *value,
 					       gpointer        v_object);
+#endif
+
+#if !defined(G_DISABLE_DEPRECATED) || defined(GTK_COMPILATION)
 gsize       g_object_compat_control           (gsize           what,
                                                gpointer        data);
 #endif