diff --git a/build/script/wxwidgets.iss b/build/script/wxwidgets.iss
index aef22df6ef..ada47ee29b 100644
--- a/build/script/wxwidgets.iss
+++ b/build/script/wxwidgets.iss
@@ -1,9 +1,21 @@
 ; Script generated by the Inno Setup Script Wizard.
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
+#if GetEnv("WXW_VER") != ""
+    #define INFOFILE  "C:\wx\inno\wxWidgets\BuildCVS.txt"
+    #define SETUPFILENAME  "wxMSW-" + GetENV("WXW_VER") + "-Setup"
+    #define WX_VERSION GetENV("WXW_VER")
+#else
+    #define INFOFILE "C:\wx\inno\wxWidgets\docs\msw\install.txt"
+    #define SETUPFILENAME  "wxMSW-cvs-Setup"
+    #define WX_VERSION "CVS"
+#endif
+
+
+
 [Setup]
 AppName=wxWidgets
-AppVerName=wxWidgets 2.8.0
+AppVerName=wxWidgets {#WX_VERSION}
 AppPublisher=wxWidgets
 AppPublisherURL=http://www.wxwidgets.org
 AppSupportURL=http://www.wxwidgets.org
@@ -13,9 +25,9 @@ DefaultGroupName=wxWidgets
 DisableProgramGroupPage=yes
 LicenseFile=C:\wx\inno\wxWidgets\docs\licence.txt
 InfoBeforeFile=C:\wx\inno\wxWidgets\docs\readme.txt
-#InfoAfterFile=C:\wx\inno\wxWidgets\BuildCVS.txt
+InfoAfterFile={#INFOFILE}
 OutputDir=c:\daily
-OutputBaseFilename=wx-cvs-Msw-setup
+OutputBaseFilename={#SETUPFILENAME}
 SetupIconFile=C:\wx\inno\wxWidgets\art\wxwin.ico
 Compression=lzma
 SolidCompression=yes