diff --git a/ChangeLog b/ChangeLog
index 3e7db11f5..3029608e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-27  Iain Holmes  <iain@gnome.org>
+
+	* src/core/compositor.c: When a window is mapped, don't set damaged to
+	TRUE. Fixes a bug when redrawing shadows.
+
 2007-12-25  Iain Holmes  <iain@gnome.org>
 
 	* src/core/compositor.c: USe the compositor overlay window instead of
diff --git a/src/core/compositor.c b/src/core/compositor.c
index 0bf4f0250..88c0c5150 100644
--- a/src/core/compositor.c
+++ b/src/core/compositor.c
@@ -1029,7 +1029,7 @@ paint_windows (MetaScreen   *screen,
               cw->border_size = None;
             }
 
-#if 0          
+#if 0
           if (cw->extents) 
             {
               XFixesDestroyRegion (xdisplay, cw->extents);
@@ -1453,7 +1453,7 @@ map_win (MetaDisplay *display,
 #endif
 
   cw->attrs.map_state = IsViewable;
-  cw->damaged = TRUE;
+  cw->damaged = FALSE;
 }
 
 static void