diff --git a/common/build_version.cpp b/common/build_version.cpp
index 2034ead4a4..5c83804fb3 100644
--- a/common/build_version.cpp
+++ b/common/build_version.cpp
@@ -6,7 +6,7 @@
 #endif
 
 #ifndef KICAD_BUILD_VERSION
-#define KICAD_BUILD_VERSION "(2010-12-10 BZR 26xx)"
+#define KICAD_BUILD_VERSION "(2010-12-18 BZR 26xx)"
 #endif
 
 //#define VERSION_STABILITY      "stable"
diff --git a/gerbview/class_DCodeSelectionbox.cpp b/gerbview/class_DCodeSelectionbox.cpp
index ad247cba31..2fbf101d4f 100644
--- a/gerbview/class_DCodeSelectionbox.cpp
+++ b/gerbview/class_DCodeSelectionbox.cpp
@@ -18,9 +18,12 @@
 DCODE_SELECTION_BOX::DCODE_SELECTION_BOX( WinEDA_Toolbar* aParent, wxWindowID aId,
                              const wxPoint& aLocation, const wxSize& aSize,
                              const wxArrayString& aChoices  ) :
-    wxComboBox( aParent, aId, wxEmptyString, aLocation, aSize, aChoices, wxCB_READONLY )
+    wxComboBox( aParent, aId, wxEmptyString, aLocation, aSize, 0, NULL, wxCB_READONLY )
 {
     m_dcodeList  = &aChoices;
+    // Append aChoices here is by far faster than use aChoices inside
+    // the wxComboBox constructor
+    Append(aChoices);
 }
 
 
diff --git a/packaging/windows/nsis/install.nsi b/packaging/windows/nsis/install.nsi
index 7dce9c945b..5719b2ea56 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 "2010.12.06"
+!define PRODUCT_VERSION "2010.12.18"
 !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 f8c2cde1fa..6e0380fb82 100644
--- a/version.txt
+++ b/version.txt
@@ -1,4 +1,4 @@
 release version:
-2010 dec 10 (BZR testing 26xx)
+2010 dec 18 (BZR testing 26xx)
 files (.zip,.tgz):
-kicad-2010-12-10-testing
+kicad-2010-12-18-testing