diff --git a/build/script/wxwidgets.iss b/build/script/wxwidgets.iss
index 397b4f5649..cac662c0d2 100644
--- a/build/script/wxwidgets.iss
+++ b/build/script/wxwidgets.iss
@@ -1,14 +1,14 @@
 ; Script generated by the Inno Setup Script Wizard.
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
-#if GetEnv("WXW_VER") != ""
+#if GetEnv("WXW_VER") == "CVS"
     #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"
+#else
+    #define INFOFILE "C:\wx\inno\wxWidgets\docs\msw\install.txt"
+    #define SETUPFILENAME  "wxMSW-" + GetENV("WXW_VER") + "-Setup"
+    #define WX_VERSION GetENV("WXW_VER")
 #endif
 
 
@@ -40,7 +40,8 @@ Source: "C:\wx\inno\wxWidgets\*"; DestDir: "{app}"; Flags: ignoreversion recurse
 Filename: "{app}\wx.url"; Section: "InternetShortcut"; Key: "URL"; String: "http://www.wxwidgets.org"
 
 [Icons]
-Name: "{group}\{cm:ProgramOnTheWeb,wxWidgets {#WX_VERSION} }"; Filename: "{app}\wx.url"
+Name: "{group}\{cm:ProgramOnTheWeb,wxWidgets {#WX_VERSION}}"; Filename: "{app}\wx.url"
+Name: {group}\wxWidgets Manual; Filename: {app}\docs\htmlhelp\wx.chm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
 
 
 [UninstallDelete]