diff --git a/include/build_version.h b/include/build_version.h
index 8f48dc2fc4..37c31161f2 100644
--- a/include/build_version.h
+++ b/include/build_version.h
@@ -5,7 +5,7 @@
 
 COMMON_GLOBL wxString g_BuildVersion
 #ifdef EDA_BASE
-	(wxT("(2007-11-14)"))
+	(wxT("(2007-11-19)"))
 #endif
 ;
 
diff --git a/pcbnew/ratsnest.cpp b/pcbnew/ratsnest.cpp
index e3fa0bf8c1..bc9b02a541 100644
--- a/pcbnew/ratsnest.cpp
+++ b/pcbnew/ratsnest.cpp
@@ -114,7 +114,7 @@ void WinEDA_BasePcbFrame::Compile_Ratsnest( wxDC* DC, bool display_status_pcb )
     m_Pcb->m_Status_Pcb = 0;        /* we want a full ratnest computation, from the scratch */
     build_liste_pads();
 
-    MsgPanel->EraseMsgBox(DC);
+    MsgPanel->EraseMsgBox();
 
     msg.Printf( wxT( " %d" ), m_Pcb->m_NbPads );
     Affiche_1_Parametre( this, 1, wxT( "pads" ), msg, RED );
diff --git a/pcbnew/sel_layer.cpp b/pcbnew/sel_layer.cpp
index 22980db97e..dc80a5e9a0 100644
--- a/pcbnew/sel_layer.cpp
+++ b/pcbnew/sel_layer.cpp
@@ -58,7 +58,7 @@ int WinEDA_BasePcbFrame::SelectLayer( int default_layer, int min_layer, int max_
                                       bool null_layer )
 /****************************************************************************************/
 
-/* Install the dialog box for layer selection
+/** Install the dialog box for layer selection
  * @param default_layer = Preselection (NB_LAYERS for "(Deselect)" layer)
  * @param min_layer = min layer value (-1 if no min value)
  * @param max_layer = max layer value (-1 if no max value)
diff --git a/pcbnew/swap_layers.cpp b/pcbnew/swap_layers.cpp
index 0ccb6366b8..7e57c7c8e3 100644
--- a/pcbnew/swap_layers.cpp
+++ b/pcbnew/swap_layers.cpp
@@ -7,12 +7,13 @@
 #include "fctsys.h"
 #include "common.h"
 #include "pcbnew.h"
-
 #include "protos.h"
 
+
 #include "wx/statline.h"
 
 /* Variables locales */
+#define LAYER_NO_CHANGE NB_LAYERS
 static int New_Layer[NB_LAYERS];
 wxStaticText* layer_list[NB_LAYERS];
 
@@ -249,7 +250,7 @@ void WinEDA_SwapLayerFrame::Sel_Layer( wxCommandEvent& event )
 
     jj = New_Layer[ii];
     if( (jj < 0) || (jj > NB_LAYERS) )
-        jj = NB_LAYERS; // (Defaults to "No Change".)
+        jj = LAYER_NO_CHANGE; // (Defaults to "No Change".)
     jj = m_Parent->SelectLayer( jj, -1, -1, true );
  
     if( (jj < 0) || (jj > NB_LAYERS) )
@@ -270,7 +271,7 @@ void WinEDA_SwapLayerFrame::Sel_Layer( wxCommandEvent& event )
     if( jj != New_Layer[ii] )
     {
         New_Layer[ii] = jj;
-        if( jj == NB_LAYERS )
+        if( jj >= LAYER_NO_CHANGE )
         {
             layer_list[ii]->SetLabel( _( "No Change" ) );
             // Change the text color to blue (to highlight
@@ -317,7 +318,7 @@ void WinEDA_PcbFrame::Swap_Layers( wxCommandEvent& event )
 
     /* Init default values */
     for( ii = 0; ii < NB_LAYERS; ii++ )
-        New_Layer[ii] = NB_LAYERS;
+        New_Layer[ii] = LAYER_NO_CHANGE;
 
     WinEDA_SwapLayerFrame* frame = new WinEDA_SwapLayerFrame( this );
 
@@ -339,16 +340,16 @@ void WinEDA_PcbFrame::Swap_Layers( wxCommandEvent& event )
                 continue;
             int     top_layer, bottom_layer;
             Via->ReturnLayerPair( &top_layer, &bottom_layer );
-            if( New_Layer[bottom_layer] >= 0 )
+            if(  New_Layer[bottom_layer] >= 0 && New_Layer[bottom_layer] < LAYER_NO_CHANGE )
                 bottom_layer = New_Layer[bottom_layer];
-            if( New_Layer[top_layer] >= 0 )
+            if( New_Layer[top_layer] >= 0 && New_Layer[top_layer] < LAYER_NO_CHANGE )
                 top_layer = New_Layer[top_layer];
             Via->SetLayerPair( top_layer, bottom_layer );
         }
         else
         {
             jj = pt_segm->GetLayer();
-            if( New_Layer[jj] >= 0 )
+            if( New_Layer[jj] >= 0 && New_Layer[jj] < LAYER_NO_CHANGE )
                 pt_segm->SetLayer( New_Layer[jj] );
         }
     }
@@ -359,7 +360,7 @@ void WinEDA_PcbFrame::Swap_Layers( wxCommandEvent& event )
     {
         m_CurrentScreen->SetModify();
         jj = pt_segm->GetLayer();
-        if( New_Layer[jj] >= 0 )
+        if( New_Layer[jj] >= 0 && New_Layer[jj] < LAYER_NO_CHANGE )
             pt_segm->SetLayer( New_Layer[jj] );
     }
 
@@ -372,7 +373,7 @@ void WinEDA_PcbFrame::Swap_Layers( wxCommandEvent& event )
             m_CurrentScreen->SetModify();
             pt_drawsegm = (DRAWSEGMENT*) PtStruct;
             jj = pt_drawsegm->GetLayer();
-            if( New_Layer[jj] >= 0 )
+            if( New_Layer[jj] >= 0 && New_Layer[jj] < LAYER_NO_CHANGE )
                 pt_drawsegm->SetLayer( New_Layer[jj] );
         }
     }
diff --git a/version.txt b/version.txt
index bee13cb8bb..354613fda8 100644
--- a/version.txt
+++ b/version.txt
@@ -1,4 +1,4 @@
 release version:
-09 nov 2007
+19 nov 2007
 files (.zip,.tgz):
-kicad-2007-11-14
+kicad-2007-11-19