diff --git a/tools/install/win32/build-fpc.bat b/tools/install/win32/build-fpc.bat
index da16ff207f..fdbcaa1cc9 100644
--- a/tools/install/win32/build-fpc.bat
+++ b/tools/install/win32/build-fpc.bat
@@ -10,8 +10,8 @@ copy %FPCBINDIR%\ld.exe %FPCBINDIR%\ldw.exe
 
 %SOURCE_DIR:~,2%
 cd %SOURCE_DIR%
-%MAKEEXE% clean PP=%RELEASE_PPC% >> %LOGFILE%
-%MAKEEXE% compiler_cycle PP=%RELEASE_PPC% >> %LOGFILE%
+%MAKEEXE% clean PP=%RELEASE_PPC% >> %LOGFILE% 2>&1
+%MAKEEXE% compiler_cycle PP=%RELEASE_PPC% >> %LOGFILE% 2>&1
 
 del %FPCBINDIR%\asw.exe 
 del %FPCBINDIR%\ldw.exe 
diff --git a/tools/install/win32/build-lazarus.bat b/tools/install/win32/build-lazarus.bat
index 608e45a86b..d2fb9cf04f 100644
--- a/tools/install/win32/build-lazarus.bat
+++ b/tools/install/win32/build-lazarus.bat
@@ -6,6 +6,7 @@ SET COMPILER=%BUILDDIR%\pp\bin\i386-win32\ppc386.exe
 %BUILDDRIVE%
 cd %BUILDDIR%
 %MAKEEXE% clean PP=%COMPILER% >> %LOGFILE%
+%MAKEEXE% lcl OPT="-gl -Xs -XX -Ur" PP=%COMPILER% >> %LOGFILE%
 %MAKEEXE% all OPT="-gl -Xs -XX" PP=%COMPILER% >> %LOGFILE%
 %FPCBINDIR%\strip.exe lazarus.exe
 
diff --git a/tools/install/win32/create_installer.bat b/tools/install/win32/create_installer.bat
index f777c9ff94..70e63002a0 100644
--- a/tools/install/win32/create_installer.bat
+++ b/tools/install/win32/create_installer.bat
@@ -1,18 +1,19 @@
 :: This setting need to change for every build
-SET LAZVERSION=0.9.5
+SET LAZVERSION=0.9.6
 
 :: These settings are dependent on the configuration of the build machine
 :: Path to the Inno Setup Compiler
-SET ISCC="C:\Program Files\Inno Setup 4\iscc.exe"
+SET ISCC="C:\Program Files\Inno Setup 5\iscc.exe"
 
 :: Path to the fpc sources checked out of cvs
-SET FPCCVSDIR=c:\lazarus\source\fpc-1.9
+SET FPCCVSDIR=c:\lazarus\source\fpc-1.9.8
 
 :: Path to the lazarus sources checked out of cvs
-SET LAZCVSDIR=c:\lazarus\source\lazarus
+SET LAZCVSDIR=c:\lazarus\source\lazcvs
 
 :: Path to fpc 1.0.10 compiler
 SET RELEASE_PPC=c:\fpc\bin\ppc386-release.exe
+::SET RELEASE_PPC=c:\fpc\1.9.6\bin\i386-win32\ppc386.exe
 
 :: Path to the directory containing some third party utilities used by fpc
 :: it will be copied completely to the pp\bin\win32 directory
@@ -80,7 +81,7 @@ if not exist %BUILDDIR%\startlazarus.exe goto END
 %ISCC% lazarus.iss >> installer.log
 
 :: do not delete build dir, if installer failed.
-if not exist output\lazarus-{%LAZVERSION%}-{%DATESTAMP%}-win32.exe goto END
+if not exist output\lazarus-%LAZVERSION%-%DATESTAMP%-win32.exe goto END
 
 :: delete build dir
 rd /s /q %BUILDDIR% > NUL
diff --git a/tools/install/win32/lazarus.iss b/tools/install/win32/lazarus.iss
index 3081593420..1d86825869 100644
--- a/tools/install/win32/lazarus.iss
+++ b/tools/install/win32/lazarus.iss
@@ -35,8 +35,16 @@ Source: environmentoptions.xml; DestDir: {app}; Flags: onlyifdoesntexist; AfterI
 Source: editoroptions.xml; DestDir: {app}; Flags: onlyifdoesntexist
 Source: samplefpc.cfg; DestDir: {app}\pp\bin\i386-win32; AfterInstall: UpdateFpcCfg; DestName: fpc.cfg
 
+[INI]
+Filename: {app}\Lazarus Home Page.url; Section: InternetShortcut; Key: URL; String: http://www.lazarus.freepascal.org/
+Filename: {app}\Lazarus Forums.url; Section: InternetShortcut; Key: URL; String: http://www.lazarus.freepascal.org/modules.php?op=modload&name=PNphpBB2&file=index
+Filename: {app}\Lazarus Wiki Help.url; Section: InternetShortcut; Key: URL; String: http://lazarus-ccr.sourceforge.net/kb/index.php/Main_Page
+
 [Icons]
 Name: {group}\{#AppName}; Filename: {app}\lazarus.exe
+Name: {group}\{cm:ProgramOnTheWeb,Lazarus}; Filename: {app}\Lazarus Home Page.url; IconFilename: {app}\images\LazarusProject.ico
+Name: {group}\Lazarus Forums; Filename: {app}\Lazarus Forums.url; IconFilename: {app}\images\LazarusProject.ico
+Name: {group}\Lazarus Wiki Help; Filename: {app}\Lazarus Wiki Help.url; IconFilename: {app}\images\LazarusProject.ico
 Name: {group}\{cm:UninstallProgram,Lazarus}; Filename: {uninstallexe}
 Name: {userdesktop}\Lazarus; Filename: {app}\lazarus.exe; Tasks: desktopicon