diff --git a/os/win32/installer/install.nsi b/os/win32/installer/install.nsi
index 01ef28507b..399bfccbe9 100644
--- a/os/win32/installer/install.nsi
+++ b/os/win32/installer/install.nsi
@@ -1,8 +1,8 @@
 ; Define your application name
 !define APPNAME "OpenTTD"
-!define APPNAMEANDVERSION "OpenTTD 0.3.5.0"
-!define APPVERSION "0.3.5.0"
-!define INSTALLERVERSION 13 ;NEED TO UPDATE THIS FOR EVERY RELEASE!!!
+!define APPNAMEANDVERSION "OpenTTD 0.3.6.0"
+!define APPVERSION "0.3.6.0"
+!define INSTALLERVERSION 14 ;NEED TO UPDATE THIS FOR EVERY RELEASE!!!
 
 BrandingText "OpenTTD Installer"
 
@@ -102,6 +102,9 @@ Section "!OpenTTD" Section1
   File ${PATH_ROOT}data\opntitle.dat
   File ${PATH_ROOT}data\signalsw.grf
   File ${PATH_ROOT}data\trkfoundw.grf
+  ; Copy scenario files
+	SetOutPath "$INSTDIR\scenario\"
+  File ${PATH_ROOT}scenario\*.scn
 
 	; Copy the rest of the stuff
 	SetOutPath "$INSTDIR\"
@@ -114,7 +117,7 @@ Section "!OpenTTD" Section1
 
 	; Copy executable
 	File /oname=OpenTTD.exe        ${PATH_ROOT}Release\openttd.exe
-	File ${PATH_ROOT}strgen\Release\strgen.exe
+	File ${PATH_ROOT}strgen\Debug\strgen.exe
 
 
   ; Delete old files from the main dir. they are now placed in data/ and lang/
diff --git a/readme.txt b/readme.txt
index e9b5630a82..bf67131241 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,6 +1,6 @@
 OpenTTD README
 Last updated:    $LastChangedDate: 2004-12-24 00:25:11 +0100 $
-Release version: 0.3.5
+Release version: 0.3.6
 ------------------------------------------------------------------------
 
 
diff --git a/ttd.dsp b/ttd.dsp
index 1b8a672802..2716cd1682 100644
--- a/ttd.dsp
+++ b/ttd.dsp
@@ -925,7 +925,7 @@ SOURCE=.\changelog.txt
 # End Source File
 
 # Begin Source File
-SOURCE=.\icon1.ico
+SOURCE=.\openttd.ico
 # End Source File
 
 # Begin Source File
diff --git a/ttd.rc b/ttd.rc
index 58a7bc6691..82c152dac5 100644
--- a/ttd.rc
+++ b/ttd.rc
@@ -30,8 +30,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-100                     ICON    DISCARDABLE     "mainicon.ico"
-101                     ICON    DISCARDABLE     "openttd.ico"
+100                     ICON    DISCARDABLE     "openttd.ico"
+101                     ICON    DISCARDABLE     "mainicon.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //