diff --git a/ChangeLog b/ChangeLog
index d0f00c8a91..ac7021752e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-28  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkaboutdialog.c (gtk_show_about_dialog): Destroy
+	the dialog with the parent.  (#156557, Paolo Borelli)
+
 2004-10-27  Matthias Clasen  <mclasen@redhat.com>
 
 	* Bump version
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d0f00c8a91..ac7021752e 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-10-28  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkaboutdialog.c (gtk_show_about_dialog): Destroy
+	the dialog with the parent.  (#156557, Paolo Borelli)
+
 2004-10-27  Matthias Clasen  <mclasen@redhat.com>
 
 	* Bump version
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d0f00c8a91..ac7021752e 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-10-28  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkaboutdialog.c (gtk_show_about_dialog): Destroy
+	the dialog with the parent.  (#156557, Paolo Borelli)
+
 2004-10-27  Matthias Clasen  <mclasen@redhat.com>
 
 	* Bump version
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d0f00c8a91..ac7021752e 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-10-28  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkaboutdialog.c (gtk_show_about_dialog): Destroy
+	the dialog with the parent.  (#156557, Paolo Borelli)
+
 2004-10-27  Matthias Clasen  <mclasen@redhat.com>
 
 	* Bump version
diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c
index 8b351541f2..095743b0c7 100644
--- a/gtk/gtkaboutdialog.c
+++ b/gtk/gtkaboutdialog.c
@@ -2014,6 +2014,7 @@ gtk_show_about_dialog (GtkWindow   *parent,
       if (parent) 
 	{
 	  gtk_window_set_transient_for (GTK_WINDOW (dialog), parent);
+	  gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
 	  g_object_set_data_full (G_OBJECT (parent), "gtk-about-dialog", 
 				  dialog, g_object_unref);
 	}