diff --git a/capplets/common/ChangeLog b/capplets/common/ChangeLog
index efd649816..4b6ed325e 100644
--- a/capplets/common/ChangeLog
+++ b/capplets/common/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-18  Thomas Wood  <thos@gnome.org>
+
+	* gconf-property-editor.c: (gconf_property_editor_class_init),
+	(gconf_property_editor_get_prop): Allow the data property to be
+	read as well as written.
+
 2008-05-18  Jens Granseuer  <jensgr@gmx.net>
 
 	* gconf-property-editor.c: (gconf_property_editor_init),
diff --git a/capplets/common/gconf-property-editor.c b/capplets/common/gconf-property-editor.c
index 287b2f64a..728b528e5 100644
--- a/capplets/common/gconf-property-editor.c
+++ b/capplets/common/gconf-property-editor.c
@@ -179,7 +179,7 @@ gconf_property_editor_class_init (GConfPropertyEditorClass *class)
 		 g_param_spec_pointer ("data",
 				       _("Property editor object data"),
 				       _("Custom data required by the specific property editor"),
-				       G_PARAM_WRITABLE));
+				       G_PARAM_READWRITE));
 
 	g_object_class_install_property
 		(object_class, PROP_DATA_FREE_CB,
@@ -276,6 +276,9 @@ gconf_property_editor_get_prop (GObject    *object,
 		g_value_set_pointer (value, peditor->p->changeset);
 		break;
 
+	case PROP_DATA:
+		g_value_set_pointer (value, peditor->p->data);
+		break;
 	default:
 		g_warning ("Bad argument get");
 		break;