diff --git a/ChangeLog b/ChangeLog
index 487d6a2a80..a98b7c6107 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-19  Owen Taylor  <otaylor@redhat.com>
+
+	Small cleanups to debug messages for GtkPlug/GtkSocket
+
+	* gtk/gtksocket-x11.c: Fix debug message to say "Socket" not "Plug"
+	* gtk/gtkplug-x11.c: Remove excess newlines from the ends of debug messages.
+
 2008-09-19  Carlos Garnacho  <carlos@imendio.com>
 
 	Bug 83935 – GtkEntry's default invisible char should be U+25CF
diff --git a/gtk/gtkplug-x11.c b/gtk/gtkplug-x11.c
index 028b2fe288..95dcf1ab6f 100644
--- a/gtk/gtkplug-x11.c
+++ b/gtk/gtkplug-x11.c
@@ -241,7 +241,7 @@ _gtk_plug_windowing_filter_func (GdkXEvent *gdk_xevent,
 	XReparentEvent *xre = &xevent->xreparent;
 	gboolean was_embedded = plug->socket_window != NULL;
 
-	GTK_NOTE (PLUGSOCKET, g_message("GtkPlug: ReparentNotify received\n"));
+	GTK_NOTE (PLUGSOCKET, g_message("GtkPlug: ReparentNotify received"));
 
 	return_val = GDK_FILTER_REMOVE;
 	
@@ -251,7 +251,7 @@ _gtk_plug_windowing_filter_func (GdkXEvent *gdk_xevent,
 	  {
 	    /* End of embedding protocol for previous socket */
 	    
-	    GTK_NOTE (PLUGSOCKET, g_message ("GtkPlug: end of embedding\n"));
+	    GTK_NOTE (PLUGSOCKET, g_message ("GtkPlug: end of embedding"));
 	    /* FIXME: race if we remove from another socket and
 	     * then add to a local window before we get notification
 	     * Probably need check in _gtk_plug_add_to_socket
@@ -276,7 +276,7 @@ _gtk_plug_windowing_filter_func (GdkXEvent *gdk_xevent,
 
 		if (xre->parent == GDK_WINDOW_XWINDOW (gdk_screen_get_root_window (screen)))
 		  {
-		    GTK_NOTE (PLUGSOCKET, g_message ("GtkPlug: calling gtk_plug_send_delete_event()\n"));
+		    GTK_NOTE (PLUGSOCKET, g_message ("GtkPlug: calling gtk_plug_send_delete_event()"));
 		    _gtk_plug_send_delete_event (widget);
 
 		    g_object_notify (G_OBJECT (plug), "embedded");
@@ -290,7 +290,7 @@ _gtk_plug_windowing_filter_func (GdkXEvent *gdk_xevent,
 	  {
 	    /* Start of embedding protocol */
 
-	    GTK_NOTE (PLUGSOCKET, g_message ("GtkPlug: start of embedding\n"));
+	    GTK_NOTE (PLUGSOCKET, g_message ("GtkPlug: start of embedding"));
 	    plug->socket_window = gdk_window_lookup_for_display (display, xre->parent);
 	    if (plug->socket_window)
 	      {
diff --git a/gtk/gtksocket-x11.c b/gtk/gtksocket-x11.c
index 12489088ea..bbeb8af792 100644
--- a/gtk/gtksocket-x11.c
+++ b/gtk/gtksocket-x11.c
@@ -600,7 +600,7 @@ _gtk_socket_windowing_filter_func (GdkXEvent *gdk_xevent,
       {
 	XReparentEvent *xre = &xevent->xreparent;
 
-	GTK_NOTE (PLUGSOCKET, g_message ("GtkPlug: ReparentNotify received\n"));
+	GTK_NOTE (PLUGSOCKET, g_message ("GtkSocket - ReparentNotify received"));
 	if (!socket->plug_window && xre->parent == GDK_WINDOW_XWINDOW (widget->window))
 	  {
 	    _gtk_socket_add_window (socket, xre->window, FALSE);