diff --git a/packaging/windows-innosetup/howto-build-setup.txt b/packaging/windows-innosetup/howto-build-setup.txt
new file mode 100644
index 000000000..7fa0bebd0
--- /dev/null
+++ b/packaging/windows-innosetup/howto-build-setup.txt
@@ -0,0 +1,12 @@
+
+
+1) Get MS VC 2005 SP1 redist packages for x86 and amd64 (currently http://www.microsoft.com/downloads/details.aspx?familyid=200b2fd9-ae1a-4a14-984d-389c36f85647&displaylang=en, http://www.microsoft.com/downloads/details.aspx?familyid=EB4EBE2D-33C0-4A47-9DD4-B9A6D7BD44DA&displaylang=en) and copy 'em right here.
+
+vcredist_x86.exe
+vcredist_x64.exe
+
+2) Build assimp, assimpcmd and assimpview for the 'release-dll' target and both the Win32 and x64 architectures.
+
+3) Get Inno Setup
+4) Compile, output is written to the 'out' folder.
+
diff --git a/packaging/windows-innosetup/readme_installer.txt b/packaging/windows-innosetup/readme_installer.txt
new file mode 100644
index 000000000..a16beb0d4
--- /dev/null
+++ b/packaging/windows-innosetup/readme_installer.txt
@@ -0,0 +1,15 @@
+Open Asset Import Library (Assimp) SDK Installer
+Release Notes
+
+
+
+Known Bugs & Limitations
+========================
+
+
+
+Troubleshooting
+===============
+
+1. Missing d3dx9_42.dll? 
+Install the latest DirectX runtime or grab the file from somewhere (that's evil but mostly fine).
\ No newline at end of file
diff --git a/packaging/windows-innosetup/script.iss b/packaging/windows-innosetup/script.iss
index e85f6425a..4a4e5fe96 100644
--- a/packaging/windows-innosetup/script.iss
+++ b/packaging/windows-innosetup/script.iss
@@ -15,6 +15,8 @@ LicenseFile=License.rtf
 OutputBaseFileName=assimp-sdk-1.1rc-setup
 VersionInfoVersion=1.1.0.0
 VersionInfoTextVersion=1.1rc
+VersionInfoCompany=Assimp Development Team
+ArchitecturesInstallIn64BitMode=x64
 
 [Types]
 Name: "full"; Description: "Full installation"
@@ -33,8 +35,18 @@ Name: "dassimp"; Description: "D Bindings"; Types: full
 ;Name: "vc8"; Description: "VC8 project files"; Types: full
 ;Name: "vc9"; Description: "VC9 project files"; Types: full
 
+[Run]
+Filename: "{app}\stub\vcredist_x86.exe"; StatusMsg: "Installing VS2005 SP1 redistributable package (32 Bit)"; Check: not IsWin64
+Filename: "{app}\stub\vcredist_x64.exe"; StatusMsg: "Installing VS2005 SP1 redistributable package (64 Bit)"; Check: IsWin64
+
 [Files]
 
+Source: "readme_installer.txt"; DestDir: "{app}"; Flags: isreadme
+
+; Installer stub
+Source: "vcredist_x86.exe"; DestDir: "{app}\stub\"; Check: not IsWin64
+Source: "vcredist_x64.exe"; DestDir: "{app}\stub\"; Check: IsWin64
+
 ; Common stuff
 Source: "..\..\CREDITS"; DestDir: "{app}"
 Source: "..\..\LICENSE"; DestDir: "{app}"
@@ -86,4 +98,5 @@ Source: "..\..\test\models\*"; DestDir: "{app}\test\models"; Flags: recursesubdi
 [Icons]
 Name: "{group}\Assimp Manual"; Filename: "{app}\doc\AssimpDoc.chm" ; Components: help
 Name: "{group}\Assimp Command Line Manual"; Filename: "{app}\doc\AssimpCmdDoc.chm"; Components: help
-Name: "{group}\AssimpView"; Filename: "{app}\bin\x86\assimp_view.exe"; Components: tools
+Name: "{group}\AssimpView"; Filename: "{app}\bin\x64\assimp_view.exe"; Components: tools; Check: IsWin64
+Name: "{group}\AssimpView"; Filename: "{app}\bin\x86\assimp_view.exe"; Components: tools; Check: not IsWin64