diff --git a/gobject/gobject.c b/gobject/gobject.c
index 454d8c2..60c502b 100644
--- a/gobject/gobject.c
+++ b/gobject/gobject.c
@@ -182,7 +182,7 @@ static GQuark	            quark_closure_array = 0;
 static GQuark	            quark_weak_refs = 0;
 static GQuark	            quark_toggle_refs = 0;
 static GParamSpecPool      *pspec_pool = NULL;
-static GObjectNotifyContext property_notify_context = { 0, };
+static GObjectNotifyContext property_notify_context = { G_STATIC_PRIVATE_INIT, };
 static gulong	            gobject_signals[LAST_SIGNAL] = { 0, };
 static guint (*floating_flag_handler) (GObject*, gint) = object_floating_flag_handler;
 G_LOCK_DEFINE_STATIC (construction_mutex);
@@ -321,7 +321,6 @@ g_object_do_class_init (GObjectClass *class)
   quark_weak_refs = g_quark_from_static_string ("GObject-weak-references");
   quark_toggle_refs = g_quark_from_static_string ("GObject-toggle-references");
   pspec_pool = g_param_spec_pool_new (TRUE);
-  property_notify_context.quark_notify_queue = g_quark_from_static_string ("GObject-notify-queue");
   property_notify_context.dispatcher = g_object_notify_dispatcher;
   
   class->constructor = g_object_constructor;
diff --git a/gobject/gobjectnotifyqueue.c b/gobject/gobjectnotifyqueue.c
index 1d5787b..173a8ed 100644
--- a/gobject/gobjectnotifyqueue.c
+++ b/gobject/gobjectnotifyqueue.c
@@ -38,7 +38,7 @@ typedef void (*GObjectNotifyQueueDispatcher) (GObject     *object,
 /* --- structures --- */
 struct _GObjectNotifyContext
 {
-  GQuark                       quark_notify_queue;
+  GStaticPrivate               key_notify_objects;
   GObjectNotifyQueueDispatcher dispatcher;
   GTrashStack                 *_nqueue_trash; /* unused */
 };
@@ -68,16 +68,27 @@ static inline GObjectNotifyQueue*
 g_object_notify_queue_freeze (GObject		   *object,
 			      GObjectNotifyContext *context)
 {
+  GHashTable *objects;
   GObjectNotifyQueue *nqueue;
 
-  nqueue = g_datalist_id_get_data (&object->qdata, context->quark_notify_queue);
+  objects = g_static_private_get (&context->key_notify_objects);
+  if (!objects)
+    {
+      objects = g_hash_table_new_full (g_direct_hash, g_direct_equal,
+	  NULL, g_object_notify_queue_free);
+
+      g_static_private_set (&context->key_notify_objects, objects,
+	  (GDestroyNotify) g_hash_table_unref);
+    }
+
+  nqueue = g_hash_table_lookup (objects, object);
   if (!nqueue)
     {
       nqueue = (void*) g_list_alloc ();
       memset (nqueue, 0, sizeof (*nqueue));
       nqueue->context = context;
-      g_datalist_id_set_data_full (&object->qdata, context->quark_notify_queue,
-				   nqueue, g_object_notify_queue_free);
+
+      g_hash_table_insert (objects, object, nqueue);
     }
 
   g_return_val_if_fail (nqueue->freeze_count < 65535, nqueue);
@@ -94,6 +105,7 @@ g_object_notify_queue_thaw (GObject            *object,
   GParamSpec *pspecs_mem[16], **pspecs, **free_me = NULL;
   GSList *slist;
   guint n_pspecs = 0;
+  GHashTable *objects;
 
   g_return_if_fail (nqueue->freeze_count > 0);
 
@@ -119,7 +131,10 @@ g_object_notify_queue_thaw (GObject            *object,
 
       pspecs[n_pspecs++] = pspec;
     }
-  g_datalist_id_set_data (&object->qdata, context->quark_notify_queue, NULL);
+  objects = g_static_private_get (&context->key_notify_objects);
+  g_hash_table_remove (objects, object);
+  if (g_hash_table_size (objects) == 0)
+    g_static_private_set (&context->key_notify_objects, NULL, NULL);
 
   if (n_pspecs)
     context->dispatcher (object, n_pspecs, pspecs);
@@ -162,7 +177,13 @@ static inline GObjectNotifyQueue*
 g_object_notify_queue_from_object (GObject              *object,
 				   GObjectNotifyContext *context)
 {
-  return g_datalist_id_get_data (&object->qdata, context->quark_notify_queue);
+  GHashTable *objects;
+
+  objects = g_static_private_get (&context->key_notify_objects);
+  if (objects == NULL)
+    return NULL;
+
+  return g_hash_table_lookup (objects, object);
 }
 
 
diff --git a/tests/.gitignore b/tests/.gitignore
index 0b37c5e..2d5e246 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -37,6 +37,8 @@ onceinit
 patterntest
 properties
 properties2
+properties3
+properties4
 qsort-test
 queue-test
 regex-test
diff --git a/tests/refcount/Makefile.am b/tests/refcount/Makefile.am
index ff29b59..e72c964 100644
--- a/tests/refcount/Makefile.am
+++ b/tests/refcount/Makefile.am
@@ -19,6 +19,8 @@ test_programs = 				\
 	objects2				\
 	properties				\
 	properties2				\
+	properties3				\
+	properties4				\
 	signal1					\
 	signal2					\
 	signal3
diff --git a/tests/refcount/properties3.c b/tests/refcount/properties3.c
new file mode 100644
index 0000000..56661d6
--- /dev/null
+++ b/tests/refcount/properties3.c
@@ -0,0 +1,204 @@
+#include <glib.h>
+#include <glib-object.h>
+
+#define G_TYPE_TEST                (my_test_get_type ())
+#define MY_TEST(test)              (G_TYPE_CHECK_INSTANCE_CAST ((test), G_TYPE_TEST, GTest))
+#define MY_IS_TEST(test)           (G_TYPE_CHECK_INSTANCE_TYPE ((test), G_TYPE_TEST))
+#define MY_TEST_CLASS(tclass)      (G_TYPE_CHECK_CLASS_CAST ((tclass), G_TYPE_TEST, GTestClass))
+#define MY_IS_TEST_CLASS(tclass)   (G_TYPE_CHECK_CLASS_TYPE ((tclass), G_TYPE_TEST))
+#define MY_TEST_GET_CLASS(test)    (G_TYPE_INSTANCE_GET_CLASS ((test), G_TYPE_TEST, GTestClass))
+
+enum {
+  PROP_0,
+  PROP_DUMMY
+};
+
+typedef struct _GTest GTest;
+typedef struct _GTestClass GTestClass;
+
+struct _GTest
+{
+  GObject object;
+  gint id;
+  gint dummy;
+
+  gint count;
+  gint setcount;
+};
+
+struct _GTestClass
+{
+  GObjectClass parent_class;
+};
+
+G_DEFINE_TYPE (GTest, my_test, G_TYPE_OBJECT);
+
+static volatile gboolean stopping;
+
+static void my_test_get_property (GObject    *object,
+				  guint       prop_id,
+				  GValue     *value,
+				  GParamSpec *pspec);
+static void my_test_set_property (GObject      *object,
+				  guint         prop_id,
+				  const GValue *value,
+				  GParamSpec   *pspec);
+
+static void
+my_test_class_init (GTestClass * klass)
+{
+  GObjectClass *gobject_class;
+
+  gobject_class = (GObjectClass *) klass;
+
+  gobject_class->get_property = my_test_get_property;
+  gobject_class->set_property = my_test_set_property;
+
+  g_object_class_install_property (gobject_class,
+				   PROP_DUMMY,
+				   g_param_spec_int ("dummy",
+						     NULL,
+						     NULL,
+						     0, G_MAXINT, 0,
+						     G_PARAM_READWRITE));
+}
+
+static void
+my_test_init (GTest * test)
+{
+  static guint static_id = 1;
+  test->id = static_id++;
+}
+
+static void
+my_test_get_property (GObject    *object,
+		      guint       prop_id,
+		      GValue     *value,
+		      GParamSpec *pspec)
+{
+  GTest *test;
+
+  test = MY_TEST (object);
+
+  switch (prop_id)
+    {
+    case PROP_DUMMY:
+      g_value_set_int (value, g_atomic_int_get (&test->dummy));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+my_test_set_property (GObject      *object,
+		      guint         prop_id,
+		      const GValue *value,
+		      GParamSpec   *pspec)
+{
+  GTest *test;
+
+  test = MY_TEST (object);
+
+  switch (prop_id)
+    {
+    case PROP_DUMMY:
+      g_atomic_int_set (&test->dummy, g_value_get_int (value));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+dummy_notify (GObject    *object,
+	      GParamSpec *pspec)
+{
+  GTest *test;
+
+  test = MY_TEST (object);
+
+  g_atomic_int_inc (&test->count);
+}
+
+static void
+my_test_do_property (GTest * test)
+{
+  gint dummy;
+
+  g_atomic_int_inc (&test->setcount);
+
+  g_object_get (test, "dummy", &dummy, NULL);
+  g_object_set (test, "dummy", dummy + 1, NULL);
+}
+
+static gpointer
+run_thread (GTest * test)
+{
+  gint i = 1;
+
+  while (!stopping) {
+    my_test_do_property (test);
+    if ((i++ % 10000) == 0)
+      {
+	g_print (".%c", 'a' + test->id);
+	g_thread_yield(); /* force context switch */
+      }
+  }
+
+  return NULL;
+}
+
+int
+main (int argc, char **argv)
+{
+  gint i;
+  GTest *test;
+  GArray *test_threads;
+  const gint n_threads = 5;
+
+  g_thread_init (NULL);
+
+  g_print ("START: %s\n", argv[0]);
+  g_log_set_always_fatal (G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL | g_log_set_always_fatal (G_LOG_FATAL_MASK));
+  g_type_init ();
+
+  test = g_object_new (G_TYPE_TEST, NULL);
+
+  g_assert (test->count == test->dummy);
+  g_signal_connect (test, "notify::dummy", G_CALLBACK (dummy_notify), NULL);
+
+  test_threads = g_array_new (FALSE, FALSE, sizeof (GThread *));
+
+  stopping = FALSE;
+
+  for (i = 0; i < n_threads; i++) {
+    GThread *thread;
+
+    thread = g_thread_create ((GThreadFunc) run_thread, test, TRUE, NULL);
+    g_array_append_val (test_threads, thread);
+  }
+  g_usleep (30000000);
+
+  stopping = TRUE;
+  g_print ("\nstopping\n");
+
+  /* join all threads */
+  for (i = 0; i < n_threads; i++) {
+    GThread *thread;
+
+    thread = g_array_index (test_threads, GThread *, i);
+    g_thread_join (thread);
+  }
+
+  g_print ("stopped\n");
+
+  g_print ("%d %d\n", test->setcount, test->count);
+
+  g_array_free (test_threads, TRUE);
+  g_object_unref (test);
+
+  return 0;
+}
diff --git a/tests/refcount/properties4.c b/tests/refcount/properties4.c
new file mode 100644
index 0000000..69411bb
--- /dev/null
+++ b/tests/refcount/properties4.c
@@ -0,0 +1,169 @@
+#include <glib.h>
+#include <glib-object.h>
+
+#define MY_TYPE_BADGER              (my_badger_get_type ())
+#define MY_BADGER(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), MY_TYPE_BADGER, MyBadger))
+#define MY_IS_BADGER(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MY_TYPE_BADGER))
+#define MY_BADGER_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), MY_TYPE_BADGER, MyBadgerClass))
+#define MY_IS_BADGER_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), MY_TYPE_BADGER))
+#define MY_BADGER_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), MY_TYPE_BADGER, MyBadgerClass))
+
+enum {
+  PROP_0,
+  PROP_MAMA
+};
+
+typedef struct _MyBadger MyBadger;
+typedef struct _MyBadgerClass MyBadgerClass;
+
+struct _MyBadger
+{
+  GObject parent_instance;
+
+  MyBadger * mama;
+  guint mama_notify_count;
+};
+
+struct _MyBadgerClass
+{
+  GObjectClass parent_class;
+};
+
+G_DEFINE_TYPE (MyBadger, my_badger, G_TYPE_OBJECT);
+
+static void my_badger_dispose (GObject * object);
+
+static void my_badger_get_property (GObject    *object,
+				    guint       prop_id,
+				    GValue     *value,
+				    GParamSpec *pspec);
+static void my_badger_set_property (GObject      *object,
+				    guint         prop_id,
+				    const GValue *value,
+				    GParamSpec   *pspec);
+
+static void my_badger_mama_notify (GObject    *object,
+				   GParamSpec *pspec);
+
+static void
+my_badger_class_init (MyBadgerClass * klass)
+{
+  GObjectClass *gobject_class;
+
+  gobject_class = (GObjectClass *) klass;
+
+  gobject_class->dispose = my_badger_dispose;
+
+  gobject_class->get_property = my_badger_get_property;
+  gobject_class->set_property = my_badger_set_property;
+
+  g_object_class_install_property (gobject_class,
+				   PROP_MAMA,
+				   g_param_spec_object ("mama",
+							NULL,
+							NULL,
+							MY_TYPE_BADGER,
+							G_PARAM_READWRITE));
+}
+
+static void
+my_badger_init (MyBadger * self)
+{
+  g_signal_connect (self, "notify::mama", G_CALLBACK (my_badger_mama_notify),
+      NULL);
+}
+
+static void
+my_badger_dispose (GObject * object)
+{
+  MyBadger * self;
+
+  self = MY_BADGER (object);
+
+  if (self->mama != NULL)
+    {
+      g_object_unref (self->mama);
+      self->mama = NULL;
+    }
+
+  G_OBJECT_CLASS (my_badger_parent_class)->dispose (object);
+}
+
+static void
+my_badger_get_property (GObject    *object,
+			guint        prop_id,
+			GValue     *value,
+			GParamSpec *pspec)
+{
+  MyBadger *self;
+
+  self = MY_BADGER (object);
+
+  switch (prop_id)
+    {
+    case PROP_MAMA:
+      g_value_set_object (value, self->mama);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+my_badger_set_property (GObject      *object,
+			guint         prop_id,
+			const GValue *value,
+			GParamSpec   *pspec)
+{
+  MyBadger *self;
+
+  self = MY_BADGER (object);
+
+  switch (prop_id)
+    {
+    case PROP_MAMA:
+      if (self->mama)
+	g_object_unref (self->mama);
+      self->mama = g_value_dup_object (value);
+      if (self->mama)
+	g_object_set (self->mama, "mama", NULL, NULL); /* another notify */
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+my_badger_mama_notify (GObject    *object,
+                       GParamSpec *pspec)
+{
+  MyBadger *self;
+
+  self = MY_BADGER (object);
+
+  self->mama_notify_count++;
+}
+
+int
+main (int argc, char **argv)
+{
+  MyBadger * badger1, * badger2;
+
+  g_print ("START: %s\n", argv[0]);
+  g_log_set_always_fatal (G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL | g_log_set_always_fatal (G_LOG_FATAL_MASK));
+  g_type_init ();
+
+  badger1 = g_object_new (MY_TYPE_BADGER, NULL);
+  badger2 = g_object_new (MY_TYPE_BADGER, NULL);
+
+  g_object_set (badger1, "mama", badger2, NULL);
+  g_assert_cmpuint (badger1->mama_notify_count, ==, 1);
+  g_assert_cmpuint (badger2->mama_notify_count, ==, 1);
+
+  g_object_unref (badger1);
+  g_object_unref (badger2);
+
+  return 0;
+}
