diff --git a/ChangeLog b/ChangeLog
index fa34c435bd..b0728e839f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-21  Björn Lindqvist  <bjourne@gmail.com>
+
+	Bug 539363 – Segfault when creating GtkPlugs
+
+	* gtk/gtkplug.c (gtk_plug_class_init): Spaces not allowed in
+	property names. "socket window" => "socket-window"
+
 2008-06-20  Jody Goldberg <jody@gnome.org>
 
 	* gtk/gtkprintoperation-win32.c (gtk_print_run_page_setup_dialog) : 
diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c
index 9202b476ed..86e9dd7d12 100644
--- a/gtk/gtkplug.c
+++ b/gtk/gtkplug.c
@@ -161,7 +161,7 @@ gtk_plug_class_init (GtkPlugClass *class)
    */
   g_object_class_install_property (gobject_class,
 				   PROP_SOCKET_WINDOW,
-				   g_param_spec_object ("socket window",
+				   g_param_spec_object ("socket-window",
 							P_("Socket Window"),
 							P_("The window of the socket the plug is embedded in"),
 							GDK_TYPE_WINDOW,