diff --git a/expat/win32/expat.iss b/expat/win32/expat.iss
index da6fb7b3..a8a1b75e 100644
--- a/expat/win32/expat.iss
+++ b/expat/win32/expat.iss
@@ -27,43 +27,39 @@ DisableProgramGroupPage=yes
 DisableReadyPage=yes
 
 [Files]
-Flags: ignoreversion; Source: xmlwf\Release\*.exe;        DestDir: "{app}"
-Flags: ignoreversion; Source: win32\MANIFEST.txt;         DestDir: "{app}"
-Flags: ignoreversion; Source: Changes;                    DestDir: "{app}"; DestName: Changes.txt
-Flags: ignoreversion; Source: COPYING;                    DestDir: "{app}"; DestName: COPYING.txt
-Flags: ignoreversion; Source: README;                     DestDir: "{app}"; DestName: README.txt
-Flags: ignoreversion; Source: doc\*.html;                 DestDir: "{app}\Doc"
-Flags: ignoreversion; Source: doc\*.css;                  DestDir: "{app}\Doc"
-Flags: ignoreversion; Source: doc\*.png;                  DestDir: "{app}\Doc"
-Flags: ignoreversion; Source: lib\Release\*.dll;          DestDir: "{app}\Libs"
-Flags: ignoreversion; Source: lib\Release\*.lib;          DestDir: "{app}\Libs"
-Flags: ignoreversion; Source: lib\Release-w\*.dll;        DestDir: "{app}\Libs"
-Flags: ignoreversion; Source: lib\Release-w\*.lib;        DestDir: "{app}\Libs"
-Flags: ignoreversion; Source: lib\Release_static\*.lib;   DestDir: "{app}\StaticLibs"
-Flags: ignoreversion; Source: lib\Release-w_static\*.lib; DestDir: "{app}\StaticLibs"
-Flags: ignoreversion; Source: expat.dsw;                  DestDir: "{app}\Source"
-Flags: ignoreversion; Source: win32\README.txt;           DestDir: "{app}\Source"
-Flags: ignoreversion; Source: bcb5\*.bp*;                 DestDir: "{app}\Source\bcb5"
-Flags: ignoreversion; Source: bcb5\*.mak;                 DestDir: "{app}\Source\bcb5"
-Flags: ignoreversion; Source: bcb5\*.def;                 DestDir: "{app}\Source\bcb5"
-Flags: ignoreversion; Source: bcb5\*.txt;                 DestDir: "{app}\Source\bcb5"
-Flags: ignoreversion; Source: bcb5\*.bat;                 DestDir: "{app}\Source\bcb5"
-Flags: ignoreversion; Source: lib\*.c;                    DestDir: "{app}\Source\lib"
-Flags: ignoreversion; Source: lib\*.h;                    DestDir: "{app}\Source\lib"
-Flags: ignoreversion; Source: lib\*.def;                  DestDir: "{app}\Source\lib"
-Flags: ignoreversion; Source: lib\*.dsp;                  DestDir: "{app}\Source\lib"
-Flags: ignoreversion; Source: examples\*.c;               DestDir: "{app}\Source\examples"
-Flags: ignoreversion; Source: examples\*.dsp;             DestDir: "{app}\Source\examples"
-Flags: ignoreversion; Source: tests\*.c;                  DestDir: "{app}\Source\tests"
-Flags: ignoreversion; Source: tests\*.cpp;                DestDir: "{app}\Source\tests"
-Flags: ignoreversion; Source: tests\*.h;                  DestDir: "{app}\Source\tests"
-Flags: ignoreversion; Source: tests\README.txt;           DestDir: "{app}\Source\tests"
-Flags: ignoreversion; Source: tests\benchmark\*.c;        DestDir: "{app}\Source\tests\benchmark"
-Flags: ignoreversion; Source: tests\benchmark\*.ds*;      DestDir: "{app}\Source\tests\benchmark"
-Flags: ignoreversion; Source: tests\benchmark\README.txt; DestDir: "{app}\Source\tests\benchmark"
-Flags: ignoreversion; Source: xmlwf\*.c*;                 DestDir: "{app}\Source\xmlwf"
-Flags: ignoreversion; Source: xmlwf\*.h;                  DestDir: "{app}\Source\xmlwf"
-Flags: ignoreversion; Source: xmlwf\*.dsp;                DestDir: "{app}\Source\xmlwf"
+Flags: ignoreversion; Source: win32\bin\Release\xmlwf.exe;  DestDir: "{app}\Bin"
+Flags: ignoreversion; Source: win32\MANIFEST.txt;           DestDir: "{app}"
+Flags: ignoreversion; Source: Changes;                      DestDir: "{app}"; DestName: Changes.txt
+Flags: ignoreversion; Source: COPYING;                      DestDir: "{app}"; DestName: COPYING.txt
+Flags: ignoreversion; Source: README;                       DestDir: "{app}"; DestName: README.txt
+Flags: ignoreversion; Source: doc\*.html;                   DestDir: "{app}\Doc"
+Flags: ignoreversion; Source: doc\*.css;                    DestDir: "{app}\Doc"
+Flags: ignoreversion; Source: doc\*.png;                    DestDir: "{app}\Doc"
+Flags: ignoreversion; Source: win32\bin\Release\*.dll;      DestDir: "{app}\Bin"
+Flags: ignoreversion; Source: win32\bin\Release\*.lib;      DestDir: "{app}\Bin"
+Flags: ignoreversion; Source: expat.dsw;                    DestDir: "{app}\Source"
+Flags: ignoreversion; Source: win32\README.txt;             DestDir: "{app}\Source"
+Flags: ignoreversion; Source: bcb5\*.bp*;                   DestDir: "{app}\Source\bcb5"
+Flags: ignoreversion; Source: bcb5\*.mak;                   DestDir: "{app}\Source\bcb5"
+Flags: ignoreversion; Source: bcb5\*.def;                   DestDir: "{app}\Source\bcb5"
+Flags: ignoreversion; Source: bcb5\*.txt;                   DestDir: "{app}\Source\bcb5"
+Flags: ignoreversion; Source: bcb5\*.bat;                   DestDir: "{app}\Source\bcb5"
+Flags: ignoreversion; Source: lib\*.c;                      DestDir: "{app}\Source\lib"
+Flags: ignoreversion; Source: lib\*.h;                      DestDir: "{app}\Source\lib"
+Flags: ignoreversion; Source: lib\*.def;                    DestDir: "{app}\Source\lib"
+Flags: ignoreversion; Source: lib\*.dsp;                    DestDir: "{app}\Source\lib"
+Flags: ignoreversion; Source: examples\*.c;                 DestDir: "{app}\Source\examples"
+Flags: ignoreversion; Source: examples\*.dsp;               DestDir: "{app}\Source\examples"
+Flags: ignoreversion; Source: tests\*.c;                    DestDir: "{app}\Source\tests"
+Flags: ignoreversion; Source: tests\*.cpp;                  DestDir: "{app}\Source\tests"
+Flags: ignoreversion; Source: tests\*.h;                    DestDir: "{app}\Source\tests"
+Flags: ignoreversion; Source: tests\README.txt;             DestDir: "{app}\Source\tests"
+Flags: ignoreversion; Source: tests\benchmark\*.c;          DestDir: "{app}\Source\tests\benchmark"
+Flags: ignoreversion; Source: tests\benchmark\*.ds*;        DestDir: "{app}\Source\tests\benchmark"
+Flags: ignoreversion; Source: tests\benchmark\README.txt;   DestDir: "{app}\Source\tests\benchmark"
+Flags: ignoreversion; Source: xmlwf\*.c*;                   DestDir: "{app}\Source\xmlwf"
+Flags: ignoreversion; Source: xmlwf\*.h;                    DestDir: "{app}\Source\xmlwf"
+Flags: ignoreversion; Source: xmlwf\*.dsp;                  DestDir: "{app}\Source\xmlwf"
 
 [Messages]
 WelcomeLabel1=Welcome to the Expat XML Parser Setup Wizard