Index: Setup/CheckForNetFx.pas
==================================================================
--- Setup/CheckForNetFx.pas
+++ Setup/CheckForNetFx.pas
@@ -205,11 +205,11 @@
   NetFx4HasServicePack := 'Servicing';
   NetFx4ServicePack := 0;
   NetFx4ErrorMessage := 'The Microsoft .NET Framework v4.0 with Service Pack '
       + IntToStr(NetFx4ServicePack) + ' or higher is required.';
 
-  VcRuntimeRedistributable := 'vcredist_{#AppProcessor}_{#VcRuntime}_SP1.exe';
+  VcRuntimeRedistributable := 'vcredist_{#AppProcessor}_{#VcRuntime}.exe';
 
   if IsNetFx2Setup then
   begin
     Result := CheckForNetFx2(NetFx2ServicePack);
 

Index: Setup/SQLite.iss
==================================================================
--- Setup/SQLite.iss
+++ Setup/SQLite.iss
@@ -20,11 +20,11 @@
 AppVersion={#AppVersion}
 AppComments=The ADO.NET adapter for the SQLite database engine.
 AppReadmeFile={app}\readme.htm
 DefaultDirName={pf}\System.Data.SQLite
 DefaultGroupName=System.Data.SQLite
-OutputBaseFilename=System.Data.SQLite.Setup_{#AppProcessor}_{#VcRuntime}
+OutputBaseFilename=System.Data.SQLite.Setup_{#AppProcessor}_{#Year}
 SetupLogging=true
 UninstallFilesDir={app}\uninstall
 VersionInfoVersion={#AppVersion}
 ExtraDiskSpaceRequired=2097152
 
@@ -62,11 +62,11 @@
 Name: {app}\bin
 Name: {app}\doc
 Name: {app}\GAC
 
 [Files]
-Components: Application\Core\{#AppProcessor}; Source: ..\Externals\MSVCPP\vcredist_{#AppProcessor}_{#VcRuntime}_SP1.exe; DestDir: {tmp}; Flags: dontcopy
+Components: Application\Core\{#AppProcessor}; Source: ..\Externals\MSVCPP\vcredist_{#AppProcessor}_{#VcRuntime}.exe; DestDir: {tmp}; Flags: dontcopy
 Components: Application; Source: ..\readme.htm; DestDir: {app}; Flags: restartreplace uninsrestartdelete isreadme
 Components: Application\Core\MSIL; Tasks: GAC; Source: ..\bin\Release\bin\System.Data.SQLite.dll; DestDir: {app}\GAC; StrongAssemblyName: "System.Data.SQLite, Version={#AppVersion}, Culture=neutral, PublicKeyToken={#AppPublicKey}, ProcessorArchitecture=MSIL"; Flags: restartreplace uninsrestartdelete uninsnosharedfileprompt sharedfile gacinstall
 Components: Application\Core\MSIL; Source: ..\bin\Release\bin\System.Data.SQLite.dll; DestDir: {app}\bin; Flags: restartreplace uninsrestartdelete
 Components: Application\Core\MSIL and Application\Symbols; Source: ..\bin\Release\bin\System.Data.SQLite.pdb; DestDir: {app}\bin; Flags: restartreplace uninsrestartdelete
 Components: Application\LINQ; Tasks: GAC; Source: ..\bin\Release\bin\System.Data.SQLite.Linq.dll; DestDir: {app}\GAC; StrongAssemblyName: "System.Data.SQLite.Linq, Version={#AppVersion}, Culture=neutral, PublicKeyToken={#AppPublicKey}, ProcessorArchitecture=MSIL"; Flags: restartreplace uninsrestartdelete uninsnosharedfileprompt sharedfile gacinstall

Index: Setup/bake.bat
==================================================================
--- Setup/bake.bat
+++ Setup/bake.bat
@@ -18,11 +18,11 @@
 
 %_AECHO% Running %0 %*
 
 SET PATH=%ProgramFiles%\Inno Setup 5;%PATH%
 
-%_ECHO% ISCC.exe SQLite.iss "/dAppId=%APPID%" "/dAppVersion=%VERSION%" "/dAppPublicKey=%PUBLICKEY%" "/dAppURL=%URL%" "/dIsNetFx2=%ISNETFX2%" "/dVcRuntime=%VCRUNTIME%" "/dAppPlatform=%PLATFORM%" "/dAppProcessor=%PROCESSOR%"
+%_ECHO% ISCC.exe SQLite.iss "/dAppId=%APPID%" "/dAppVersion=%VERSION%" "/dAppPublicKey=%PUBLICKEY%" "/dAppURL=%URL%" "/dIsNetFx2=%ISNETFX2%" "/dVcRuntime=%VCRUNTIME%" "/dAppPlatform=%PLATFORM%" "/dAppProcessor=%PROCESSOR%" "/dYear=%YEAR%"
 
 IF %ERRORLEVEL% NEQ 0 (
   ECHO Failed to compile setup.
   GOTO errors
 )

Index: Setup/set_x64_2008.bat
==================================================================
--- Setup/set_x64_2008.bat
+++ Setup/set_x64_2008.bat
@@ -6,8 +6,9 @@
 :: Written by Joe Mistachkin.
 :: Released to the public domain, use at your own risk!
 ::
 
 SET ISNETFX2=True
-SET VCRUNTIME=2008
+SET VCRUNTIME=2008_SP1
 SET PLATFORM=x64
 SET PROCESSOR=x64
+SET YEAR=2008

Index: Setup/set_x64_2010.bat
==================================================================
--- Setup/set_x64_2010.bat
+++ Setup/set_x64_2010.bat
@@ -6,8 +6,9 @@
 :: Written by Joe Mistachkin.
 :: Released to the public domain, use at your own risk!
 ::
 
 SET ISNETFX2=False
-SET VCRUNTIME=2010
+SET VCRUNTIME=2010_SP1
 SET PLATFORM=x64
 SET PROCESSOR=x64
+SET YEAR=2010

Index: Setup/set_x86_2008.bat
==================================================================
--- Setup/set_x86_2008.bat
+++ Setup/set_x86_2008.bat
@@ -6,8 +6,9 @@
 :: Written by Joe Mistachkin.
 :: Released to the public domain, use at your own risk!
 ::
 
 SET ISNETFX2=True
-SET VCRUNTIME=2008
+SET VCRUNTIME=2008_SP1
 SET PLATFORM=Win32
 SET PROCESSOR=x86
+SET YEAR=2008

Index: Setup/set_x86_2010.bat
==================================================================
--- Setup/set_x86_2010.bat
+++ Setup/set_x86_2010.bat
@@ -6,8 +6,9 @@
 :: Written by Joe Mistachkin.
 :: Released to the public domain, use at your own risk!
 ::
 
 SET ISNETFX2=False
-SET VCRUNTIME=2010
+SET VCRUNTIME=2010_SP1
 SET PLATFORM=Win32
 SET PROCESSOR=x86
+SET YEAR=2010