diff --git a/ChangeLog b/ChangeLog
index bb799ab5ac..252d02a93b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Nov 24 1997 Jay Painter <jpaint@serv.net>
+	* gtk/gtkaspectframe.c (gtk_aspect_frame_set): 
+	gtk-dairiki-971117-0.patch
+	Clear window when aspect ratio or alignment is changed.
+
 Mon Nov 24 1997 Jay Painter <jpaint@serv.net>
 	* gtk/gtkobject.h: fixed GTK_OBJECT_NSIGNALS macro
 
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index bb799ab5ac..252d02a93b 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Mon Nov 24 1997 Jay Painter <jpaint@serv.net>
+	* gtk/gtkaspectframe.c (gtk_aspect_frame_set): 
+	gtk-dairiki-971117-0.patch
+	Clear window when aspect ratio or alignment is changed.
+
 Mon Nov 24 1997 Jay Painter <jpaint@serv.net>
 	* gtk/gtkobject.h: fixed GTK_OBJECT_NSIGNALS macro
 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index bb799ab5ac..252d02a93b 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Mon Nov 24 1997 Jay Painter <jpaint@serv.net>
+	* gtk/gtkaspectframe.c (gtk_aspect_frame_set): 
+	gtk-dairiki-971117-0.patch
+	Clear window when aspect ratio or alignment is changed.
+
 Mon Nov 24 1997 Jay Painter <jpaint@serv.net>
 	* gtk/gtkobject.h: fixed GTK_OBJECT_NSIGNALS macro
 
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index bb799ab5ac..252d02a93b 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Mon Nov 24 1997 Jay Painter <jpaint@serv.net>
+	* gtk/gtkaspectframe.c (gtk_aspect_frame_set): 
+	gtk-dairiki-971117-0.patch
+	Clear window when aspect ratio or alignment is changed.
+
 Mon Nov 24 1997 Jay Painter <jpaint@serv.net>
 	* gtk/gtkobject.h: fixed GTK_OBJECT_NSIGNALS macro
 
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index bb799ab5ac..252d02a93b 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Mon Nov 24 1997 Jay Painter <jpaint@serv.net>
+	* gtk/gtkaspectframe.c (gtk_aspect_frame_set): 
+	gtk-dairiki-971117-0.patch
+	Clear window when aspect ratio or alignment is changed.
+
 Mon Nov 24 1997 Jay Painter <jpaint@serv.net>
 	* gtk/gtkobject.h: fixed GTK_OBJECT_NSIGNALS macro
 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index bb799ab5ac..252d02a93b 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Mon Nov 24 1997 Jay Painter <jpaint@serv.net>
+	* gtk/gtkaspectframe.c (gtk_aspect_frame_set): 
+	gtk-dairiki-971117-0.patch
+	Clear window when aspect ratio or alignment is changed.
+
 Mon Nov 24 1997 Jay Painter <jpaint@serv.net>
 	* gtk/gtkobject.h: fixed GTK_OBJECT_NSIGNALS macro
 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index bb799ab5ac..252d02a93b 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Mon Nov 24 1997 Jay Painter <jpaint@serv.net>
+	* gtk/gtkaspectframe.c (gtk_aspect_frame_set): 
+	gtk-dairiki-971117-0.patch
+	Clear window when aspect ratio or alignment is changed.
+
 Mon Nov 24 1997 Jay Painter <jpaint@serv.net>
 	* gtk/gtkobject.h: fixed GTK_OBJECT_NSIGNALS macro
 
diff --git a/gtk/gtkaspectframe.c b/gtk/gtkaspectframe.c
index 2e4795bcae..2e6594fea8 100644
--- a/gtk/gtkaspectframe.c
+++ b/gtk/gtkaspectframe.c
@@ -124,13 +124,22 @@ gtk_aspect_frame_set (GtkAspectFrame *aspect_frame,
       (aspect_frame->ratio != ratio) ||
       (aspect_frame->obey_child != obey_child))
     {
+      GtkWidget * this = GTK_WIDGET(aspect_frame);
+  
       aspect_frame->xalign = xalign;
       aspect_frame->yalign = yalign;
       aspect_frame->ratio = ratio;
       aspect_frame->obey_child = obey_child;
 
-      gtk_widget_size_allocate (GTK_WIDGET (aspect_frame), &(GTK_WIDGET (aspect_frame)->allocation));
-      gtk_widget_queue_draw (GTK_WIDGET (aspect_frame));
+      if (GTK_WIDGET_MAPPED(this))
+	  gdk_window_clear_area (this->window,
+				 this->allocation.x,
+				 this->allocation.y,
+				 this->allocation.width,
+				 this->allocation.height);
+
+      gtk_widget_size_allocate (this, &this->allocation);
+      gtk_widget_queue_draw (this);
     }
 }