diff --git a/ChangeLog b/ChangeLog
index 4736fd1cc2..6df06b8baf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-09-26  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkwindow-win32.c (gdk_window_shape_combine_mask): Set
+	the shaped flag here, too. (#316871)
+	(gdk_window_shape_combine_region): Currently unimplemented, so
+	don't do anything to the shaped flag here.
+
 2005-09-26  Matthias Clasen  <mclasen@redhat.com>
 
 	Fix #316871, reported by Dan Winship:
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4736fd1cc2..6df06b8baf 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2005-09-26  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkwindow-win32.c (gdk_window_shape_combine_mask): Set
+	the shaped flag here, too. (#316871)
+	(gdk_window_shape_combine_region): Currently unimplemented, so
+	don't do anything to the shaped flag here.
+
 2005-09-26  Matthias Clasen  <mclasen@redhat.com>
 
 	Fix #316871, reported by Dan Winship:
diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index 81d764cc40..0e1ba754ce 100644
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -2335,7 +2335,8 @@ gdk_window_shape_combine_mask (GdkWindow *window,
 			       GdkBitmap *mask,
 			       gint x, gint y)
 {
-  g_return_if_fail (window != NULL);
+  GdkWindowObject *private = (GdkWindowObject *)window;
+
   g_return_if_fail (GDK_IS_WINDOW (window));
 
   if (!mask)
@@ -2343,6 +2344,8 @@ gdk_window_shape_combine_mask (GdkWindow *window,
       GDK_NOTE (MISC, g_print ("gdk_window_shape_combine_mask: %p: none\n",
 			       GDK_WINDOW_HWND (window)));
       SetWindowRgn (GDK_WINDOW_HWND (window), NULL, TRUE);
+
+      private->shaped = FALSE;
     }
   else
     {
@@ -2370,6 +2373,8 @@ gdk_window_shape_combine_mask (GdkWindow *window,
 	}
       
       SetWindowRgn (GDK_WINDOW_HWND (window), hrgn, TRUE);
+
+      private->shaped = TRUE;
     }
 }