diff --git a/common/build_version.cpp b/common/build_version.cpp
index 58dc3f4a8a..2e5e0d8394 100644
--- a/common/build_version.cpp
+++ b/common/build_version.cpp
@@ -6,7 +6,7 @@
 #endif
 
 #ifndef KICAD_BUILD_VERSION
-#define KICAD_BUILD_VERSION "(2011-05-25)"
+#define KICAD_BUILD_VERSION "(2011-05-31)"
 #endif
 
 
diff --git a/gerbview/draw_gerber_screen.cpp b/gerbview/draw_gerber_screen.cpp
index c9cd534df7..3bfea3ff90 100644
--- a/gerbview/draw_gerber_screen.cpp
+++ b/gerbview/draw_gerber_screen.cpp
@@ -227,15 +227,17 @@ void BOARD::Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, int aDrawMode, const wxPoin
                     screenDC.Blit( 0, 0, bitmapWidth, bitmapHeight,
                                    &layerDC, 0, 0, wxOR );
                 }
+                // Restore actual values and clear bitmpap for next drawing
+                layerDC.SetDeviceOrigin( dev_org.x, dev_org.y );
+                layerDC.SetLogicalOrigin( logical_org.x, logical_org.y );
+                layerDC.SetUserScale( scale, scale );
+                layerDC.SetBackground( bgBrush );
+                layerDC.SetBackgroundMode( wxSOLID );
+                layerDC.Clear();
+
+                doBlit = false;
             }
 
-            // Restore actual values for drawing
-            layerDC.SetDeviceOrigin( dev_org.x, dev_org.y );
-            layerDC.SetLogicalOrigin( logical_org.x, logical_org.y );
-            layerDC.SetUserScale( scale, scale );
-
-            doBlit = false;
-            layerDC.Clear();
         }
 
         if( gerber->m_ImageNegative )
diff --git a/packaging/windows/nsis/install.nsi b/packaging/windows/nsis/install.nsi
index 3cbb72540e..767961eea8 100644
--- a/packaging/windows/nsis/install.nsi
+++ b/packaging/windows/nsis/install.nsi
@@ -17,7 +17,7 @@
 
 ; General Product Description Definitions
 !define PRODUCT_NAME "KiCad"
-!define PRODUCT_VERSION "2011.05.25"
+!define PRODUCT_VERSION "2011.05.31"
 !define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/"
 !define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/"
 !define COMPANY_NAME ""
diff --git a/version.txt b/version.txt
index d6728ca252..ca0332ad61 100644
--- a/version.txt
+++ b/version.txt
@@ -1,4 +1,4 @@
 release version:
-2011 may 25
+2011 may 31
 files (.zip,.tgz):
-kicad-2011-05-12
+kicad-2011-05-31