From f9fb0ec21ef9e9b2d63a32d0dff114a6608c2924 Mon Sep 17 00:00:00 2001
From: Scott Cantor <cantor.2@osu.edu>
Date: Fri, 18 May 2012 21:10:59 +0000
Subject: [PATCH] Updated for 2.5 fileset plus various cleanups

---
 msi/WiX/MergeModules/Curl-x64.wxs           |  12 +-
 msi/WiX/MergeModules/Curl-x86.wxs           |   8 +-
 msi/WiX/MergeModules/FastCGI-x64.wxs        |   9 +-
 msi/WiX/MergeModules/FastCGI-x86.wxs        |   9 +-
 msi/WiX/MergeModules/Log4Shib-x64.wxs       |   8 +-
 msi/WiX/MergeModules/Log4Shib-x86.wxs       |   8 +-
 msi/WiX/MergeModules/OpenSAML-schemas.wxs   | 266 +++++++++++++---------------
 msi/WiX/MergeModules/OpenSAML-x64.wxs       |  22 +--
 msi/WiX/MergeModules/OpenSAML-x86.wxs       |  26 +--
 msi/WiX/MergeModules/OpenSSL-x64.wxs        |  16 +-
 msi/WiX/MergeModules/OpenSSL-x86.wxs        |  16 +-
 msi/WiX/MergeModules/Shibboleth-schemas.wxs |  67 +++----
 msi/WiX/MergeModules/Shibboleth-x64.wxs     |  31 ++--
 msi/WiX/MergeModules/Shibboleth-x86.wxs     |  33 ++--
 msi/WiX/MergeModules/Xerces-x64.wxs         |   7 +-
 msi/WiX/MergeModules/Xerces-x86.wxs         |   7 +-
 msi/WiX/MergeModules/XmlSec-x64.wxs         |  33 ++--
 msi/WiX/MergeModules/XmlSec-x86.wxs         |  33 ++--
 msi/WiX/MergeModules/Zlib-x64.wxs           |   6 +-
 msi/WiX/MergeModules/Zlib-x86.wxs           |   6 +-
 msi/WiX/MergeModules/tes.wxs                |  36 ++--
 msi/WiX/ShibbolethSP-defs-x86.wxi           |  51 +++---
 msi/WiX/ShibbolethSP-exe-x64.wxs            | 119 +++++--------
 msi/WiX/ShibbolethSP-exe-x86.wxs            | 146 ++++++---------
 msi/WiX/ShibbolethSP-main-x64.wxs           |  37 ++--
 msi/WiX/ShibbolethSP-main-x86.wxs           |   8 +-
 msi/WiX/ShibbolethSP-noarch.wxs             | 181 ++++++++-----------
 msi/WiX/ShibbolethSP-properties.wxi         |   6 +-
 msi/WiX/ShibbolethSP-registry-x64.wxs       |  16 +-
 msi/WiX/ShibbolethSP-registry-x86.wxs       |  16 +-
 msi/WiX/ShibbolethSP-shibd-dialog.wxs       |   2 +-
 msi/WiX/Versions.wxi                        |  14 +-
 32 files changed, 571 insertions(+), 684 deletions(-)

diff --git a/msi/WiX/MergeModules/Curl-x64.wxs b/msi/WiX/MergeModules/Curl-x64.wxs
index 6a10b14..68f80ee 100644
--- a/msi/WiX/MergeModules/Curl-x64.wxs
+++ b/msi/WiX/MergeModules/Curl-x64.wxs
@@ -30,20 +30,20 @@
           <Directory Id='shibboleth_sp' Name='SP'>
             <Directory Id='lib' Name='lib'>
               <Component Id='libcurl.dll' Guid='{14BDB19A-B7F1-4038-B114-8388F3FF07F0}' Win64='yes'>
-                <File KeyPath='yes'
-                      Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\release-dll-ssl-dll-zlib-dll.x64\libcurl.dll'/>
+                <File KeyPath='yes' Checksum='yes'
+                      Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\release-dll-ssl-dll-zlib-dll.64\libcurl.dll'/>
               </Component>
               <Component Id='curl.exe' Guid='{52103377-AEF6-4533-B0CE-D3A786D2D17E}' Win64='yes'>
-                <File KeyPath='yes' 
+                <File KeyPath='yes' Checksum='yes'
                       Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\src\release.x64\curl.exe'/>
               </Component>
               <Directory Id='lib_debug' Name='debug'>
                 <Component Id='libcurld.dll' Guid='{6F225F9F-25CD-4F6D-8A8F-01C6DD0F0959}' Win64='yes'>
-                  <File KeyPath='yes' 
-                        Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll.x64\libcurld.dll'/>
+                  <File KeyPath='yes' Checksum='yes'
+                        Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll.64\libcurld.dll'/>
                 </Component>
                 <Component Id='curl.exe_debug' Guid='{F363D42B-8CB6-4ED8-B2D3-3637B6110E38}' Win64='yes'>
-                  <File Id='curl.exe_debug' KeyPath='yes' 
+                  <File Id='curl.exe_debug' KeyPath='yes' Checksum='yes'
                         Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\src\debug.x64\curl.exe'/>
                 </Component>
               </Directory><!-- lib_debug-->
diff --git a/msi/WiX/MergeModules/Curl-x86.wxs b/msi/WiX/MergeModules/Curl-x86.wxs
index dd03a63..55cdcd4 100644
--- a/msi/WiX/MergeModules/Curl-x86.wxs
+++ b/msi/WiX/MergeModules/Curl-x86.wxs
@@ -30,20 +30,20 @@
           <Directory Id='shibboleth_sp' Name='SP'>
             <Directory Id='lib' Name='lib'>
               <Component Id='libcurl.dll' Guid='{8F72A198-4D90-47DC-BBAC-123D51DE4192}'>
-                <File KeyPath='yes' 
+                <File KeyPath='yes' Checksum='yes'
                       Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\release-dll-ssl-dll-zlib-dll\libcurl.dll'/>
               </Component>
               <Component Id='curl.exe' Guid='{67A6F011-9715-43C2-92F1-70FE53E935AD}'>
-                <File KeyPath='yes' 
+                <File KeyPath='yes' Checksum='yes'
                       Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\src\release\curl.exe'/>
               </Component>
               <Directory Id='lib_debug' Name='debug'>
                 <Component Id='libcurld.dll' Guid='{EFAEA264-C49A-4A91-816F-DD151F094892}'>
-                  <File KeyPath='yes' 
+                  <File KeyPath='yes' Checksum='yes'
                         Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll\libcurld.dll'/>
                 </Component>
                 <Component Id='curl.exe_debug' Guid='{FB6BF939-9744-49ED-ACBF-8956B9C5DE29}'>
-                  <File Id='curl.exe_debug' KeyPath='yes' 
+                  <File Id='curl.exe_debug' KeyPath='yes' Checksum='yes'
                         Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\src\debug\curl.exe'/>
                 </Component>
               </Directory><!-- lib_debug-->
diff --git a/msi/WiX/MergeModules/FastCGI-x64.wxs b/msi/WiX/MergeModules/FastCGI-x64.wxs
index 5c97050..c086b8d 100644
--- a/msi/WiX/MergeModules/FastCGI-x64.wxs
+++ b/msi/WiX/MergeModules/FastCGI-x64.wxs
@@ -30,17 +30,20 @@
           <Directory Id='shibboleth_SP' Name='SP'>
             <Directory Id='lib' Name='lib'>
               <Component Id='libfcgi.dll' Guid='{B3854D00-6E8A-4107-B1E3-26DD71F1C43D}' Win64='yes'>
-                <File KeyPath='yes' Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\x64\Release\libfcgi.dll' />
+                <File KeyPath='yes' Checksum='yes'
+                  Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\x64\Release\libfcgi.dll' />
               </Component>
               <Directory Id='lib_debug' Name='debug'>
                 <Component Id='libfcgid.dll' Guid='{A7EF753D-0729-47A2-BFBB-56C7152CF4A7}' Win64='yes'>
-                  <File KeyPath='yes' Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\x64\Debug\libfcgid.dll' />
+                  <File KeyPath='yes' Checksum='yes'
+                    Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\x64\Debug\libfcgid.dll' />
                 </Component>
               </Directory><!-- lib_debug-->
             </Directory><!-- lib -->
             <Directory Id='doc' Name='doc'>
               <Component Id='FASTCGI.LICENSE' Guid='{FC00E9B5-72B1-4E87-A5C4-26EE6A7BA509}' Win64='yes'>
-                <File KeyPath='yes' Name='FASTCGI.LICENSE' Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\LICENSE.TERMS' />
+                <File KeyPath='yes' Name='FASTCGI.LICENSE'
+                  Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\LICENSE.TERMS' />
               </Component>
             </Directory><!-- doc -->
           </Directory><!-- shibboleth -->
diff --git a/msi/WiX/MergeModules/FastCGI-x86.wxs b/msi/WiX/MergeModules/FastCGI-x86.wxs
index 32b0853..a8dba68 100644
--- a/msi/WiX/MergeModules/FastCGI-x86.wxs
+++ b/msi/WiX/MergeModules/FastCGI-x86.wxs
@@ -30,17 +30,20 @@
           <Directory Id='shibboleth_SP' Name='SP'>
             <Directory Id='lib' Name='lib'>
               <Component Id='libfcgi.dll' Guid='{FD6F8E32-CBDF-4662-A39C-8EC713483C51}'>
-                <File KeyPath='yes' Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\Release\libfcgi.dll' />
+                <File KeyPath='yes' Checksum='yes'
+                  Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\Release\libfcgi.dll' />
               </Component>
               <Directory Id='lib_debug' Name='debug'>
                 <Component Id='libfcgid.dll' Guid='{682FFA3A-D517-4332-BCC5-EF24252C3528}'>
-                  <File KeyPath='yes' Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\Debug\libfcgid.dll' />
+                  <File KeyPath='yes' Checksum='yes'
+                    Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\Debug\libfcgid.dll' />
                 </Component>
               </Directory><!-- lib_debug-->
             </Directory><!-- lib -->
             <Directory Id='doc' Name='doc'>
               <Component Id='FASTCGI.LICENSE' Guid='{3FB61369-D8A7-4076-B659-DEDA2558A1AF}'>
-                <File KeyPath='yes' Name='FASTCGI.LICENSE' Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\LICENSE.TERMS' />
+                <File KeyPath='yes' Name='FASTCGI.LICENSE'
+                  Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\LICENSE.TERMS' />
               </Component>
             </Directory><!-- doc -->
           </Directory><!-- shibboleth -->
diff --git a/msi/WiX/MergeModules/Log4Shib-x64.wxs b/msi/WiX/MergeModules/Log4Shib-x64.wxs
index 8fc65ab..9732828 100644
--- a/msi/WiX/MergeModules/Log4Shib-x64.wxs
+++ b/msi/WiX/MergeModules/Log4Shib-x64.wxs
@@ -30,17 +30,17 @@
           <Directory Id='shibboleth_SP' Name='SP'>
             <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\x64\Release\'>
               <Component Id='log4shib.dll' Guid='{DA7E5213-363E-4E13-B05D-90905BE9FB94}' Win64='yes'>
-                <File KeyPath='yes' Name='log4shib$(var.LogForShibFileVersion).dll'/>
+                <File KeyPath='yes' Checksum='yes' Name='log4shib$(var.LogForShibFileVersion).dll'/>
               </Component>
               <Component Id='NTEventLogAppender.dll' Guid='{1A559035-DCA4-4297-AE94-C3E6ABB37662}' Win64='yes'>
-                <File KeyPath='yes' Name='NTEventLogAppender.dll'/>
+                <File KeyPath='yes' Checksum='yes' Name='NTEventLogAppender.dll'/>
               </Component>
               <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\x64\Debug\'>
                 <Component Id='log4shibD.dll' Guid='{792E6762-70FE-418A-9336-39DDF1A6BAE7}' Win64='yes'>
-                  <File KeyPath='yes' Name='log4shib$(var.LogForShibFileVersion)D.dll'/>
+                  <File KeyPath='yes' Checksum='yes' Name='log4shib$(var.LogForShibFileVersion)D.dll'/>
                 </Component>
                 <Component Id='NTEventLogAppender.dll_debug' Guid='{6C23C432-EA11-4313-9F5F-DBB09A8752E8}' Win64='yes'>
-                  <File Id='NTEventLogAppenderD.dll' KeyPath='yes' Name='NTEventLogAppender.dll'/>
+                  <File Id='NTEventLogAppender.dll_debug' KeyPath='yes' Checksum='yes' Name='NTEventLogAppender.dll'/>
                 </Component>
               </Directory><!-- lib_debug-->
             </Directory><!-- lib -->
diff --git a/msi/WiX/MergeModules/Log4Shib-x86.wxs b/msi/WiX/MergeModules/Log4Shib-x86.wxs
index e8992d7..ab96d28 100644
--- a/msi/WiX/MergeModules/Log4Shib-x86.wxs
+++ b/msi/WiX/MergeModules/Log4Shib-x86.wxs
@@ -30,17 +30,17 @@
           <Directory Id='shibboleth_SP' Name='SP'>
             <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Release\'>
               <Component Id='log4shib.dll' Guid='{2FDE8ED0-774A-4F44-88D5-C7089350D895}'>
-                <File KeyPath='yes' Name='log4shib$(var.LogForShibFileVersion).dll'/>
+                <File KeyPath='yes' Checksum='yes' Name='log4shib$(var.LogForShibFileVersion).dll'/>
               </Component>
               <Component Id='NTEventLogAppender.dll' Guid='{43B944CB-E42A-4D17-A601-AC4E14DA2217}'>
-                <File KeyPath='yes' Name='NTEventLogAppender.dll'/>
+                <File KeyPath='yes' Checksum='yes' Name='NTEventLogAppender.dll'/>
               </Component>
               <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Debug\'>
                 <Component Id='log4shibD.dll' Guid='{B8D2E797-F5A8-4E0D-B57F-9A7D4E699942}'>
-                  <File KeyPath='yes' Name='log4shib$(var.LogForShibFileVersion)D.dll'/>
+                  <File KeyPath='yes' Checksum='yes' Name='log4shib$(var.LogForShibFileVersion)D.dll'/>
                 </Component>
                 <Component Id='NTEventLogAppender.dll_debug' Guid='{5501F9FA-C6EC-48A7-8318-EA8C918DC8BF}'>
-                  <File Id='NTEventLogAppenderD.dll' KeyPath='yes' Name='NTEventLogAppender.dll'/>
+                  <File Id='NTEventLogAppender.dll_debug' KeyPath='yes' Checksum='yes' Name='NTEventLogAppender.dll'/>
                 </Component>
               </Directory><!-- lib_debug-->
             </Directory><!-- lib -->
diff --git a/msi/WiX/MergeModules/OpenSAML-schemas.wxs b/msi/WiX/MergeModules/OpenSAML-schemas.wxs
index 8771dac..a789a25 100644
--- a/msi/WiX/MergeModules/OpenSAML-schemas.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-schemas.wxs
@@ -19,7 +19,7 @@
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
 
-  <Module Id='OpenSAMLMergeModule_schemas' Language='1033' Version='$(var.OpenSAMLVersion)'>
+  <Module Id='OpenSAMLSchemasMergeModule' Language='1033' Version='$(var.OpenSAMLVersion)'>
     <Package Id='{8567178A-EEA1-4798-9D20-C2E2F7247D0F}' Description='Merge Module for OpenSAML schemas'
              Comments='This module is built by the Shibboleth Consortium'
              Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>
@@ -30,182 +30,178 @@
           <Directory Id='SP' Name='SP' >
             <Directory Id='xml' Name='xml' >
               <Directory Id='opensaml' Name='opensaml' FileSource='$(var.SPBuildDirectory)\cpp-opensaml\schemas\' >
-                <Component Id='cs-sstc-schema-assertion-01.xsd' Guid='{3BB83A55-9212-40F4-86E1-D95CEDAE5501}'>
-                  <File KeyPath='yes' Name='cs-sstc-schema-assertion-01.xsd'/>
+                <Component Id='assertion_01.xsd' Guid='{3BB83A55-9212-40F4-86E1-D95CEDAE5501}'>
+                  <File KeyPath='yes' Id='assertion_01.xsd' Name='cs-sstc-schema-assertion-01.xsd'/>
                 </Component>
-                <Component Id='cs-sstc-schema-assertion-1.1.xsd' Guid='{D01E45CD-41D8-4029-AB27-103D36734D07}'>
-                  <File KeyPath='yes' Name='cs-sstc-schema-assertion-1.1.xsd' />
+                <Component Id='assertion_1.1.xsd' Guid='{D01E45CD-41D8-4029-AB27-103D36734D07}'>
+                  <File KeyPath='yes' Id='assertion_1.1.xsd' Name='cs-sstc-schema-assertion-1.1.xsd' />
                 </Component>
-                <Component Id='cs-sstc-schema-protocol-01.xsd' Guid='{333BABD7-1EDF-4F7C-85A7-4FDD804E57D3}'>
-                  <File KeyPath='yes' Name='cs-sstc-schema-protocol-01.xsd' />
+                <Component Id='protocol_01.xsd' Guid='{333BABD7-1EDF-4F7C-85A7-4FDD804E57D3}'>
+                  <File KeyPath='yes' Id='protocol_01.xsd' Name='cs-sstc-schema-protocol-01.xsd' />
                 </Component>
-                <Component Id='cs-sstc-schema-protocol-1.1.xsd' Guid='{CB8A87E7-A8FE-44E7-AE2F-D5C41F66A1C0}'>
-                  <File KeyPath='yes' Name='cs-sstc-schema-protocol-1.1.xsd' />
+                <Component Id='protocol_1.1.xsd' Guid='{CB8A87E7-A8FE-44E7-AE2F-D5C41F66A1C0}'>
+                  <File KeyPath='yes' Id='protocol_1.1.xsd' Name='cs-sstc-schema-protocol-1.1.xsd' />
                 </Component>
-                <Component Id='saml10-catalog.xml' Guid='{7E08BA59-AC67-4FEF-A3C4-DA01F59E16E0}'>
+                <Component Id='saml10_catalog.xml' Guid='{7E08BA59-AC67-4FEF-A3C4-DA01F59E16E0}'>
                   <File KeyPath='yes' Name='saml10-catalog.xml' Source='$(var.SPBuildDirectory)\cpp-opensaml\schemas\saml10-catalog.xml.in' />
                 </Component>
-                <Component Id='saml11-catalog.xml' Guid='{4D599268-82B3-4C69-BB24-8E3D0FC79BE1}'>
+                <Component Id='saml11_catalog.xml' Guid='{4D599268-82B3-4C69-BB24-8E3D0FC79BE1}'>
                   <File KeyPath='yes' Name='saml11-catalog.xml' Source='$(var.SPBuildDirectory)\cpp-opensaml\schemas\saml11-catalog.xml.in' />
                 </Component>
-                <Component Id='saml20-catalog.xml' Guid='{2A9829FE-518F-478B-B116-5B6A3087A6C9}'>
+                <Component Id='saml20_catalog.xml' Guid='{2A9829FE-518F-478B-B116-5B6A3087A6C9}'>
                   <File KeyPath='yes' Name='saml20-catalog.xml' Source='$(var.SPBuildDirectory)\cpp-opensaml\schemas\saml20-catalog.xml.in' />
                 </Component>
-                <Component Id='saml-schema-assertion-2.0.xsd' Guid='{6A785715-2E2E-4DFC-948B-94711E1DC355}'>
-                  <File KeyPath='yes' Name='saml-schema-assertion-2.0.xsd' />
+                <Component Id='assertion_2.0.xsd' Guid='{6A785715-2E2E-4DFC-948B-94711E1DC355}'>
+                  <File KeyPath='yes' Id='assertion_2.0.xsd' Name='saml-schema-assertion-2.0.xsd' />
                 </Component>
-                <Component Id='saml-schema-authn-context-2.0.xsd' Guid='{7EC7E7A6-464C-4137-8E20-DDE9BD4F7706}'>
-                  <File KeyPath='yes' Name='saml-schema-authn-context-2.0.xsd' />
+                <Component Id='authn_context_2.0.xsd' Guid='{7EC7E7A6-464C-4137-8E20-DDE9BD4F7706}'>
+                  <File KeyPath='yes' Id='authn_context_2.0.xsd' Name='saml-schema-authn-context-2.0.xsd' />
                 </Component>
-                <Component Id='saml-schema-authn-context-auth-telephony-2.0.xsd' Guid='{81BDD012-6863-45DF-86CB-138B627D7D17}'>
-                  <File KeyPath='yes' Name='saml-schema-authn-context-auth-telephony-2.0.xsd' />
+                <Component Id='ac_auth_telephony_2.0.xsd' Guid='{81BDD012-6863-45DF-86CB-138B627D7D17}'>
+                  <File KeyPath='yes' Id='ac_auth_telephony_2.0.xsd' Name='saml-schema-authn-context-auth-telephony-2.0.xsd' />
                 </Component>
-                <Component Id='saml-schema-authn-context-ip-2.0.xsd' Guid='{A47F07CA-77B4-40E5-A8FA-955C626E6E38}'>
-                  <File KeyPath='yes' Name='saml-schema-authn-context-ip-2.0.xsd' />
+                <Component Id='ac_ip_2.0.xsd' Guid='{A47F07CA-77B4-40E5-A8FA-955C626E6E38}'>
+                  <File KeyPath='yes' Id='ac_ip_2.0.xsd' Name='saml-schema-authn-context-ip-2.0.xsd' />
                 </Component>
-                <Component Id='saml-schema-authn-context-ippword-2.0.xsd' Guid='{9052E8FD-D9B5-42CB-836A-C1A825DA6B3F}'>
-                  <File KeyPath='yes' Name='saml-schema-authn-context-ippword-2.0.xsd' />
+                <Component Id='ac_ippword_2.0.xsd' Guid='{9052E8FD-D9B5-42CB-836A-C1A825DA6B3F}'>
+                  <File KeyPath='yes' Id='ac_ippword_2.0.xsd' Name='saml-schema-authn-context-ippword-2.0.xsd' />
                 </Component>
-                <Component Id='saml-schema-authn-context-kerberos-2.0.xsd' Guid='{03D7CD55-AF85-4B1A-A09F-991D5BCC3C71}'>
-                  <File KeyPath='yes' Name='saml-schema-authn-context-kerberos-2.0.xsd' />
+                <Component Id='ac_kerberos_2.0.xsd' Guid='{03D7CD55-AF85-4B1A-A09F-991D5BCC3C71}'>
+                  <File KeyPath='yes' Id='ac_kerberos_2.0.xsd' Name='saml-schema-authn-context-kerberos-2.0.xsd' />
                 </Component>
-                <Component Id='saml-schema-authn-context-mobileonefactor-reg-2.0.xsd' Guid='{B934A845-5027-4B80-9C8B-DE6BA42E1D1C}'>
-                  <File KeyPath='yes' Name='saml-schema-authn-context-mobileonefactor-reg-2.0.xsd' />
+                <Component Id='ac_mobileonefactor_reg_2.0.xsd' Guid='{B934A845-5027-4B80-9C8B-DE6BA42E1D1C}'>
+                  <File KeyPath='yes' Id='ac_mobileonefactor_reg_2.0.xsd' Name='saml-schema-authn-context-mobileonefactor-reg-2.0.xsd' />
                 </Component>
-                <Component Id='saml-schema-authn-context-mobileonefactor-unreg-2.0.xsd' Guid='{B2DCED0E-E97E-448E-83D1-6CDFC8711EA9}'>
-                  <File KeyPath='yes' Name='saml-schema-authn-context-mobileonefactor-unreg-2.0.xsd' />
+                <Component Id='ac_mobileonefactor_unreg_2.0.xsd' Guid='{B2DCED0E-E97E-448E-83D1-6CDFC8711EA9}'>
+                  <File KeyPath='yes' Id='ac_mobileonefactor_unreg_2.0.xsd' Name='saml-schema-authn-context-mobileonefactor-unreg-2.0.xsd' />
                 </Component>
-                <Component Id='saml-schema-authn-context-mobiletwofactor-reg-2.0.xsd' Guid='{70C79D92-D7AF-49FB-A332-72F431582C6A}'>
-                  <File KeyPath='yes' Name='saml-schema-authn-context-mobiletwofactor-reg-2.0.xsd' />
+                <Component Id='ac_mobiletwofactor_reg_2.0.xsd' Guid='{70C79D92-D7AF-49FB-A332-72F431582C6A}'>
+                  <File KeyPath='yes' Id='ac_mobiletwofactor_reg_2.0.xsd' Name='saml-schema-authn-context-mobiletwofactor-reg-2.0.xsd' />
                 </Component>
-                <Component Id='saml-schema-authn-context-mobiletwofactor-unreg-2.0.xsd' Guid='{195F5D51-1FD6-410A-9A48-9C4AAF1202FB}'>
-                  <File KeyPath='yes' Name='saml-schema-authn-context-mobiletwofactor-unreg-2.0.xsd' />
+                <Component Id='ac_mobiletwofactor_unreg_2.0.xsd' Guid='{195F5D51-1FD6-410A-9A48-9C4AAF1202FB}'>
+                  <File KeyPath='yes' Id='ac_mobiletwofactor_unreg_2.0.xsd' Name='saml-schema-authn-context-mobiletwofactor-unreg-2.0.xsd' />
                 </Component>
-                <Component Id='saml-schema-authn-context-nomad-telephony-2.0.xsd' Guid='{13686CA3-58F4-4176-9297-3E797D075A6E}'>
-                  <File KeyPath='yes' Name='saml-schema-authn-context-nomad-telephony-2.0.xsd' />
+                <Component Id='ac_nomad_telephony_2.0.xsd' Guid='{13686CA3-58F4-4176-9297-3E797D075A6E}'>
+                  <File KeyPath='yes' Id='ac_nomad_telephony_2.0.xsd' Name='saml-schema-authn-context-nomad-telephony-2.0.xsd' />
                 </Component>
-                <Component Id='saml-schema-authn-context-personal-telephony-2.0.xsd' Guid='{10BFBEF9-B458-4CF2-930A-404D1BDCF4B8}'>
-                  <File KeyPath='yes' Name='saml-schema-authn-context-personal-telephony-2.0.xsd' />
+                <Component Id='ac_personal_telephony_2.0.xsd' Guid='{10BFBEF9-B458-4CF2-930A-404D1BDCF4B8}'>
+                  <File KeyPath='yes' Id='ac_personal_telephony_2.0.xsd' Name='saml-schema-authn-context-personal-telephony-2.0.xsd' />
                 </Component>
-                <Component Id='saml-schema-authn-context-pgp-2.0.xsd' Guid='{4514C6C6-0DFB-4A4B-BD93-36D856937199}'>
-                  <File KeyPath='yes' Name='saml-schema-authn-context-pgp-2.0.xsd' />
+                <Component Id='ac_pgp_2.0.xsd' Guid='{4514C6C6-0DFB-4A4B-BD93-36D856937199}'>
+                  <File KeyPath='yes' Id='ac_pgp_2.0.xsd' Name='saml-schema-authn-context-pgp-2.0.xsd' />
                 </Component>
-                <Component Id='saml-schema-authn-context-ppt-2.0.xsd' Guid='{8AB6A86E-DEDC-49C3-B1BB-92DAFBE49351}'>
-                  <File KeyPath='yes' Name='saml-schema-authn-context-ppt-2.0.xsd' />
+                <Component Id='ac_ppt_2.0.xsd' Guid='{8AB6A86E-DEDC-49C3-B1BB-92DAFBE49351}'>
+                  <File KeyPath='yes' Id='ac_ppt_2.0.xsd' Name='saml-schema-authn-context-ppt-2.0.xsd' />
                 </Component>
-                <Component Id='samlschema18' Guid='{77793E85-3003-4D75-862E-7164AB576D6D}'>
-                  <File Id='a_c_pword2.0.xsd' Name='saml-schema-authn-context-pword-2.0.xsd' />
+                <Component Id='ac_pword_2.0.xsd' Guid='{77793E85-3003-4D75-862E-7164AB576D6D}'>
+                  <File KeyPath='yes' Id='ac_pword_2.0.xsd' Name='saml-schema-authn-context-pword-2.0.xsd' />
                 </Component>
-                <Component Id='samlschema19' Guid='{D426514A-1A01-4B70-9375-C5240E9267FB}'>
-                  <File Id='a_c_session2.0.xsd' Name='saml-schema-authn-context-session-2.0.xsd' />
+                <Component Id='ac_session_2.0.xsd' Guid='{D426514A-1A01-4B70-9375-C5240E9267FB}'>
+                  <File KeyPath='yes' Id='ac_session_2.0.xsd' Name='saml-schema-authn-context-session-2.0.xsd' />
                 </Component>
-                <Component Id='samlschema20' Guid='{3A57FE98-237B-4993-ACCE-6BC5ECAF0E54}'>
-                  <File Id='a_c_smartcard2.0.xsd' Name='saml-schema-authn-context-smartcard-2.0.xsd' />
+                <Component Id='ac_smartcard_2.0.xsd' Guid='{3A57FE98-237B-4993-ACCE-6BC5ECAF0E54}'>
+                  <File KeyPath='yes' Id='ac_smartcard_2.0.xsd' Name='saml-schema-authn-context-smartcard-2.0.xsd' />
                 </Component>
-                <Component Id='samlschema1a' Guid='{CBAE6C22-E0B1-42E5-BF3F-AAD55EAA6193}'>
-                  <File Id='a_c_smartcardpki2.0.xsd' Name='saml-schema-authn-context-smartcardpki-2.0.xsd' />
+                <Component Id='ac_smartcardpki_2.0.xsd' Guid='{CBAE6C22-E0B1-42E5-BF3F-AAD55EAA6193}'>
+                  <File KeyPath='yes' Id='ac_smartcardpki_2.0.xsd' Name='saml-schema-authn-context-smartcardpki-2.0.xsd' />
                 </Component>
-                <Component Id='samlschema1b' Guid='{BB0D6BE0-9C42-4EDA-88B6-C791809B5092}'>
-                  <File Id='a_c_softwarepki2.0.xsd' Name='saml-schema-authn-context-softwarepki-2.0.xsd' />
+                <Component Id='ac_softwarepki_2.0.xsd' Guid='{BB0D6BE0-9C42-4EDA-88B6-C791809B5092}'>
+                  <File KeyPath='yes' Id='ac_softwarepki_2.0.xsd' Name='saml-schema-authn-context-softwarepki-2.0.xsd' />
                 </Component>
-                <Component Id='samlschema1c' Guid='{76840C0F-8991-4B6D-A32F-6053B93B60B6}'>
-                  <File Id='a_c_spki2.0.xsd' Name='saml-schema-authn-context-spki-2.0.xsd' />
+                <Component Id='ac_spki_2.0.xsd' Guid='{76840C0F-8991-4B6D-A32F-6053B93B60B6}'>
+                  <File KeyPath='yes' Id='ac_spki_2.0.xsd' Name='saml-schema-authn-context-spki-2.0.xsd' />
                 </Component>
-                <Component Id='samlschema1d' Guid='{C07DFE86-DCCA-4289-BEB8-D8B7A146EBBB}'>
-                  <File Id='a_c_srp2.0.xsd' Name='saml-schema-authn-context-srp-2.0.xsd' />
+                <Component Id='ac_srp_2.0.xsd' Guid='{C07DFE86-DCCA-4289-BEB8-D8B7A146EBBB}'>
+                  <File KeyPath='yes' Id='ac_srp_2.0.xsd' Name='saml-schema-authn-context-srp-2.0.xsd' />
                 </Component>
-                <Component Id='samlschema1e' Guid='{72BE1F0B-E2B5-40D3-A086-24D0011E718C}'>
-                  <File Id='a_c_sslcert2.0.xsd' Name='saml-schema-authn-context-sslcert-2.0.xsd' />
+                <Component Id='ac_sslcert_2.0.xsd' Guid='{72BE1F0B-E2B5-40D3-A086-24D0011E718C}'>
+                  <File KeyPath='yes' Id='ac_sslcert_2.0.xsd' Name='saml-schema-authn-context-sslcert-2.0.xsd' />
                 </Component>
-                <Component Id='samlschema1f' Guid='{BDD9E146-8AEB-4AE9-A99F-6B2072587A4C}'>
-                  <File Id='a_c_telephony2.0.xsd' Name='saml-schema-authn-context-telephony-2.0.xsd' />
+                <Component Id='ac_telephony_2.0.xsd' Guid='{BDD9E146-8AEB-4AE9-A99F-6B2072587A4C}'>
+                  <File KeyPath='yes' Id='ac_telephony_2.0.xsd' Name='saml-schema-authn-context-telephony-2.0.xsd' />
                 </Component>
-                <Component Id='samlschema1g' Guid='{8220805B-A2D3-4952-BF20-AA763B77C243}'>
-                  <File Id='a_c_timesync2.0.xsd' Name='saml-schema-authn-context-timesync-2.0.xsd' />
+                <Component Id='ac_timesync_2.0.xsd' Guid='{8220805B-A2D3-4952-BF20-AA763B77C243}'>
+                  <File KeyPath='yes' Id='ac_timesync_2.0.xsd' Name='saml-schema-authn-context-timesync-2.0.xsd' />
                 </Component>
-                <Component Id='samlschema1h' Guid='{E0ED6CFB-C41E-4E8D-AC78-ADBC22A28893}'>
-                  <File Id='a_c_types2.0.xsd' Name='saml-schema-authn-context-types-2.0.xsd' />
+                <Component Id='ac_types_2.0.xsd' Guid='{E0ED6CFB-C41E-4E8D-AC78-ADBC22A28893}'>
+                  <File KeyPath='yes' Id='ac_types_2.0.xsd' Name='saml-schema-authn-context-types-2.0.xsd' />
                 </Component>
-                <Component Id='samlschema1i' Guid='{514D0A27-C204-43BC-A8B1-47E51C4E4FE2}'>
-                  <File Id='a_c_x5092.0.xsd' Name='saml-schema-authn-context-x509-2.0.xsd' />
+                <Component Id='ac_x509_2.0.xsd' Guid='{514D0A27-C204-43BC-A8B1-47E51C4E4FE2}'>
+                  <File KeyPath='yes' Id='ac_x509_2.0.xsd' Name='saml-schema-authn-context-x509-2.0.xsd' />
                 </Component>
-                <Component Id='samlschema1j' Guid='{8BD5727A-0DE4-4739-8CCA-CC0BEA03D7B1}'>
-                  <File Id='a_c_xmldsig2.0.xsd' Name='saml-schema-authn-context-xmldsig-2.0.xsd' />
+                <Component Id='ac_xmldsig_2.0.xsd' Guid='{8BD5727A-0DE4-4739-8CCA-CC0BEA03D7B1}'>
+                  <File KeyPath='yes' Id='ac_xmldsig_2.0.xsd' Name='saml-schema-authn-context-xmldsig-2.0.xsd' />
                 </Component>
-                
-                <Component Id='samlschema1k' Guid='{669A1D43-AB09-4BCD-A989-B42DE5D50EB1}'>
-                  <File Name='saml-schema-dce-2.0.xsd'/>
+                <Component Id='dce_2.0.xsd' Guid='{669A1D43-AB09-4BCD-A989-B42DE5D50EB1}'>
+                  <File KeyPath='yes' Id='dce_2.0.xsd' Name='saml-schema-dce-2.0.xsd' />
                 </Component>
-                <Component Id='samlschema1l' Guid='{D4E12A26-39B7-407B-9177-D67799CEF333}'>
-                  <File Name='saml-schema-ecp-2.0.xsd'/>
+                <Component Id='ecp_2.0.xsd' Guid='{D4E12A26-39B7-407B-9177-D67799CEF333}'>
+                  <File KeyPath='yes' Id='ecp_2.0.xsd' Name='saml-schema-ecp-2.0.xsd' />
                 </Component>
-                <Component Id='samlschema1m' Guid='{02823006-3999-4F7B-979E-4BE0C32B6109}'>
-                  <File Name='saml-schema-metadata-2.0.xsd'/>
+                <Component Id='metadata_2.0.xsd' Guid='{02823006-3999-4F7B-979E-4BE0C32B6109}'>
+                  <File KeyPath='yes' Id='metadata_2.0.xsd' Name='saml-schema-metadata-2.0.xsd' />
                 </Component>
-                <Component Id='samlschema1n' Guid='{20E92615-EA8B-482C-80A2-6EEB103DA945}'>
-                  <File Name='saml-schema-protocol-2.0.xsd'/>
+                <Component Id='protocol_2.0.xsd' Guid='{20E92615-EA8B-482C-80A2-6EEB103DA945}'>
+                  <File KeyPath='yes' Id='protocol_2.0.xsd' Name='saml-schema-protocol-2.0.xsd' />
                 </Component>
-                <Component Id='samlschema1o' Guid='{1C737F49-4B66-47FD-A1CA-754342DFF868}'>
-                  <File Name='saml-schema-x500-2.0.xsd'/>
+                <Component Id='x500_2.0.xsd' Guid='{1C737F49-4B66-47FD-A1CA-754342DFF868}'>
+                  <File KeyPath='yes' Id='x500_2.0.xsd' Name='saml-schema-x500-2.0.xsd' />
                 </Component>
-                <Component Id='samlschema1p' Guid='{36D94CC5-8DB9-4986-B7A2-D71303966307}'>
-                  <File Name='saml-schema-xacml-2.0.xsd'/>
+                <Component Id='xacml_2.0.xsd' Guid='{36D94CC5-8DB9-4986-B7A2-D71303966307}'>
+                  <File KeyPath='yes' Id='xacml_2.0.xsd' Name='saml-schema-xacml-2.0.xsd' />
                 </Component>
-                
-                <Component Id='samlschema1q' Guid='{87188F0C-D1CF-4990-91E7-A10D23EDDFE7}'>
-                  <File Name='sstc-metadata-attr.xsd'/>
+                <Component Id='metadata_attr.xsd' Guid='{87188F0C-D1CF-4990-91E7-A10D23EDDFE7}'>
+                  <File KeyPath='yes' Id='metadata_attr.xsd' Name='sstc-metadata-attr.xsd' />
                 </Component>
-                <Component Id='samlschema1r' Guid='{F824BCC5-467B-4AEB-B2CA-BE8F465B34F5}'>
-                  <File Name='sstc-request-initiation.xsd'/>
+                <Component Id='request_initiation.xsd' Guid='{F824BCC5-467B-4AEB-B2CA-BE8F465B34F5}'>
+                  <File KeyPath='yes' Id='request_initiation.xsd' Name='sstc-request-initiation.xsd' />
                 </Component>
-                <Component Id='samlschema1s' Guid='{1F5DD1A1-A7EB-44C7-9FC5-A15E2263804F}'>
-                  <File Name='sstc-saml1x-metadata.xsd'/>
+                <Component Id='saml1x_metadata.xsd' Guid='{1F5DD1A1-A7EB-44C7-9FC5-A15E2263804F}'>
+                  <File KeyPath='yes' Id='saml1x_metadata.xsd' Name='sstc-saml1x-metadata.xsd' />
                 </Component>
-                <Component Id='samlschema1t' Guid='{E81FA4D6-C58D-4D04-8167-A4BB9E3675E9}'>
-                  <File Name='sstc-saml-attribute-ext.xsd'/>
+                <Component Id='attribute_ext.xsd' Guid='{E81FA4D6-C58D-4D04-8167-A4BB9E3675E9}'>
+                  <File KeyPath='yes' Id='attribute_ext.xsd' Name='sstc-saml-attribute-ext.xsd' />
                 </Component>
-                <Component Id='samlschema1u' Guid='{48AA3869-C62B-47B2-8E1E-80BE6AB056BE}'>
-                  <File Name='sstc-saml-delegation.xsd'/>
+                <Component Id='delegation.xsd' Guid='{48AA3869-C62B-47B2-8E1E-80BE6AB056BE}'>
+                  <File KeyPath='yes' Id='delegation.xsd' Name='sstc-saml-delegation.xsd' />
                 </Component>
-                <Component Id='samlschema1v' Guid='{9A16BE14-D5AA-40F3-8416-709B7C96E8C6}'>
-                  <File Name='sstc-saml-idp-discovery.xsd' />
+                <Component Id='idp_discovery.xsd' Guid='{9A16BE14-D5AA-40F3-8416-709B7C96E8C6}'>
+                  <File KeyPath='yes' Id='idp_discovery.xsd' Name='sstc-saml-idp-discovery.xsd' />
                 </Component>
-                <Component Id='samlschema1w' Guid='{97489B89-9651-4131-82A7-0B9F638FD25C}'>
-                  <File Id='metadata_algsupportv1.0' Name='sstc-saml-metadata-algsupport-v1.0.xsd'/>
+                <Component Id='metadata_algsupport_v1.0.xsd' Guid='{97489B89-9651-4131-82A7-0B9F638FD25C}'>
+                  <File KeyPath='yes' Id='metadata_algsupport_v1.0.xsd' Name='sstc-saml-metadata-algsupport-v1.0.xsd' />
                 </Component>
-                <Component Id='samlschema1x' Guid='{5F1380C9-7327-4D11-BC9E-CD59CC362B21}'>
-                  <File Name='sstc-saml-metadata-ext-query.xsd'/>
+                <Component Id='metadata_ext_query.xsd' Guid='{5F1380C9-7327-4D11-BC9E-CD59CC362B21}'>
+                  <File KeyPath='yes' Id='metadata_ext_query.xsd' Name='sstc-saml-metadata-ext-query.xsd' />
                 </Component>
-                <Component Id='samlschema1y' Guid='{C203B8C4-0056-46F6-96DE-E831933437D3}'>
-                  <File Name='sstc-saml-metadata-ui-v1.0.xsd'/>
+                <Component Id='metadata_ui_v1.0.xsd' Guid='{C203B8C4-0056-46F6-96DE-E831933437D3}'>
+                  <File KeyPath='yes' Id='metadata_ui_v1.0.xsd' Name='sstc-saml-metadata-ui-v1.0.xsd' />
                 </Component>
-                <Component Id='samlschema1z' Guid='{EEFDA0C0-F1F4-4C09-82CD-873F037A4296}'>
-                  <File Id='protoco_ext_thirdpaty.xsd' Name='sstc-saml-protocol-ext-thirdparty.xsd'/>
+                <Component Id='protocol_ext_thirdparty.xsd' Guid='{EEFDA0C0-F1F4-4C09-82CD-873F037A4296}'>
+                  <File KeyPath='yes' Id='protocol_ext_thirdparty.xsd' Name='sstc-saml-protocol-ext-thirdparty.xsd' />
                 </Component>
               </Directory><!-- opensaml -->
-              <Directory Id='xmltooling' Name='xmltooling'
-                FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\schemas\' >
-                <Component Id='xmltoolingschema' Guid='{2197D645-3AA3-46F1-B250-0F964B901A94}'>
-                  <File Name='xenc-schema.xsd'/>
+              <Directory Id='xmltooling' Name='xmltooling' FileSource='$(var.SPBuildDirectory)\cpp-xmltooling\schemas\' >
+                <Component Id='xenc_schema.xsd' Guid='{2197D645-3AA3-46F1-B250-0F964B901A94}'>
+                  <File KeyPath='yes' Name='xenc-schema.xsd' />
                 </Component>
-                <Component Id='xmldsigcoreschema.xsd' Guid='{72871706-1D8F-4695-B573-AF2EB0635281}'>
-                  <File Name='xmldsig-core-schema.xsd'/>
+                <Component Id='xmldsig.xsd' Guid='{72871706-1D8F-4695-B573-AF2EB0635281}'>
+                  <File KeyPath='yes' Name='xmldsig-core-schema.xsd' />
                 </Component>
-                <Component Id='soapenvelope.xsd' Guid='{A2B2255D-344E-44E9-B894-5AB3416D8CBC}'>
-                  <File Name='soap-envelope.xsd'  />
+                <Component Id='xmldsig11.xsd' Guid='{A0E6F269-77F0-47E6-B59A-887977ECE06A}'>
+                  <File KeyPath='yes' Name='xmldsig11-schema.xsd' />
+                </Component>
+                <Component Id='soap_envelope.xsd' Guid='{A2B2255D-344E-44E9-B894-5AB3416D8CBC}'>
+                  <File KeyPath='yes' Name='soap-envelope.xsd' />
                 </Component>
                 <Component Id='xml.xsd' Guid='{E58D7865-6B4D-4CDB-859F-0A69AD1E20BF}'>
-                  <File Name='xml.xsd'  />
+                  <File KeyPath='yes' Name='xml.xsd' />
                 </Component>
                 <Component Id='xmltooling.xsd' Guid='{E99A5CCE-C0A9-483C-BB02-A147E0C1A609}'>
-                  <File Name='xmltooling.xsd'  />
-                </Component>
-                <Component Id='log.xml' Guid='{CD84FD26-CCB0-4FC6-9B51-E72CC23046D8}'>
-                  <File Id='XMLToolingcatalog' Name='catalog.xml' 
-                    Source='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\schemas\catalog.xml.in'/>
+                  <File KeyPath='yes' Name='xmltooling.xsd' />
                 </Component>
-                <Component Id='xmldsig11schema.xsd' Guid='{A0E6F269-77F0-47E6-B59A-887977ECE06A}'>
-                  <File Name='xmldsig11-schema.xsd'/>
+                <Component Id='catalog.xml' Guid='{CD84FD26-CCB0-4FC6-9B51-E72CC23046D8}'>
+                  <File KeyPath='yes' Name='catalog.xml' Source='$(var.SPBuildDirectory)\cpp-xmltooling\schemas\catalog.xml.in' />
                 </Component>
               </Directory><!-- xmltooling -->
             </Directory><!-- xml -->
@@ -213,38 +209,32 @@
         </Directory><!-- Shibboleth -->
       </Directory><!-- CommonAppDataFolder -->
     </Directory><!-- TargetDir -->
-   
-    <Binary Id='EditCatalogFileSrc' SourceFile='$(var.BuildDirectory)\cvs\2.0\cpp-sp\msi\scripts\shib_edit_catalog.vbs' />
-    <CustomAction Id='EditCatalogSAML10' BinaryKey='EditCatalogFileSrc' VBScriptCall='' 
+    <Binary Id='EditCatalogFileSrc' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\scripts\shib_edit_catalog.vbs' />
+    <CustomAction Id='EditXMLToolingCatalog' BinaryKey='EditCatalogFileSrc' VBScriptCall=''
       Execute='deferred' Impersonate='no' />
-    <CustomAction Id='SetEditCatalogSAML10' Property='EditCatalogSAML10' 
-      Value='[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\;@;saml10-catalog.xml' />
-    
-    <CustomAction Id='EditCatalogSAML11' BinaryKey='EditCatalogFileSrc' VBScriptCall='' 
+    <CustomAction Id='EditCatalogSAML10' BinaryKey='EditCatalogFileSrc' VBScriptCall=''
       Execute='deferred' Impersonate='no' />
-    <CustomAction Id='SetEditCatalogSAML11' Property='EditCatalogSAML11' 
-      Value='[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\;@;saml11-catalog.xml' />
-    
-    <CustomAction Id='EditCatalogSAML20' BinaryKey='EditCatalogFileSrc' VBScriptCall='' 
+    <CustomAction Id='EditCatalogSAML11' BinaryKey='EditCatalogFileSrc' VBScriptCall=''
       Execute='deferred' Impersonate='no' />
-    <CustomAction Id='SetEditCatalogSAML20' Property='EditCatalogSAML20' 
-      Value='[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\;@;saml20-catalog.xml' />
-    
-    <CustomAction Id='EditXMLToolingCatalog' BinaryKey='EditCatalogFileSrc' VBScriptCall='' 
+    <CustomAction Id='EditCatalogSAML20' BinaryKey='EditCatalogFileSrc' VBScriptCall=''
       Execute='deferred' Impersonate='no' />
-    <CustomAction Id='SetEditXMLToolingCatalog' Property='EditXMLToolingCatalog' 
+    <CustomAction Id='SetEditXMLToolingCatalog' Property='EditXMLToolingCatalog'
       Value='[CommonAppDataFolder]Shibboleth\SP\xml\xmltooling\;@;catalog.xml' />
-
+    <CustomAction Id='SetEditCatalogSAML10' Property='EditCatalogSAML10'
+      Value='[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\;@;saml10-catalog.xml' />
+    <CustomAction Id='SetEditCatalogSAML11' Property='EditCatalogSAML11'
+      Value='[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\;@;saml11-catalog.xml' />
+    <CustomAction Id='SetEditCatalogSAML20' Property='EditCatalogSAML20'
+      Value='[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\;@;saml20-catalog.xml' />
     <InstallExecuteSequence>
+      <Custom Action='SetEditXMLToolingCatalog' Before='CostInitialize'>NOT Installed</Custom>
       <Custom Action='SetEditCatalogSAML10' Before='CostInitialize'>NOT Installed</Custom>
-      <Custom Action='EditCatalogSAML10' After='InstallFiles'>NOT Installed</Custom>
       <Custom Action='SetEditCatalogSAML11' Before='CostInitialize'>NOT Installed</Custom>
-      <Custom Action='EditCatalogSAML11' After='InstallFiles'>NOT Installed</Custom>
       <Custom Action='SetEditCatalogSAML20' Before='CostInitialize'>NOT Installed</Custom>
-      <Custom Action='EditCatalogSAML20' After='InstallFiles'>NOT Installed</Custom>
-
-      <Custom Action='SetEditXMLToolingCatalog' Before='CostInitialize'>NOT Installed</Custom>
       <Custom Action='EditXMLToolingCatalog' After='InstallFiles'>NOT Installed</Custom>
+      <Custom Action='EditCatalogSAML10' After='InstallFiles'>NOT Installed</Custom>
+      <Custom Action='EditCatalogSAML11' After='InstallFiles'>NOT Installed</Custom>
+      <Custom Action='EditCatalogSAML20' After='InstallFiles'>NOT Installed</Custom>
     </InstallExecuteSequence>
 
   </Module>
diff --git a/msi/WiX/MergeModules/OpenSAML-x64.wxs b/msi/WiX/MergeModules/OpenSAML-x64.wxs
index 0e54a31..fceaed0 100644
--- a/msi/WiX/MergeModules/OpenSAML-x64.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-x64.wxs
@@ -30,29 +30,31 @@
           <Directory Id='shibboleth_SP' Name='SP'>
             <Directory Id='lib' Name='lib' FileSource='$(var.SPBuildDirectory)\cpp-opensaml\x64\Release\'>
               <Component Id='saml.dll' Guid='{9EE0A8D1-A6DC-4E2A-904F-BBEF70A0D67B}' Win64='yes'>
-                <File KeyPath='yes' Name='saml$(var.OpenSAMLFileVersion).dll' />
+                <File KeyPath='yes' Checksum='yes' Name='saml$(var.OpenSAMLFileVersion).dll' />
               </Component>
               <Component Id='samlsign.exe' Guid='{B89B1F75-9B8A-4A15-B141-4DC3F132CD47}' Win64='yes'>
-                <File KeyPath='yes' Name='samlsign.exe' />
+                <File KeyPath='yes' Checksum='yes' Name='samlsign.exe' />
               </Component>
               <Component Id='xmltooling.dll' Guid='{7BBFB3D8-A9F8-429B-96BE-C1B283EBFDFB}' Win64='yes'>
-                <File KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Release\xmltooling$(var.XmlToolingFileVersion).dll' />
+                <File KeyPath='yes' Checksum='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Release\xmltooling$(var.XmlToolingFileVersion).dll' />
               </Component>
-              <Component Id='xmltoolinglite.dll' Guid='{060F61B9-36E9-4F33-9B5B-C59A43709052}' Win64='yes'>
-                <File KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Release\xmltooling-lite$(var.XmlToolingFileVersion).dll' />
+              <Component Id='xmltooling_lite.dll' Guid='{060F61B9-36E9-4F33-9B5B-C59A43709052}' Win64='yes'>
+                <File KeyPath='yes' Checksum='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Release\xmltooling-lite$(var.XmlToolingFileVersion).dll' />
               </Component>
               <Directory Id='lib_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-opensaml\x64\Debug\'>
                 <Component Id='samlD.dll' Guid='{00836378-7FB9-4A09-AF49-3AA33DEF9BC6}' Win64='yes'>
-                  <File KeyPath='yes' Name='saml$(var.OpenSAMLFileVersion)D.dll' />
+                  <File KeyPath='yes' Checksum='yes' Name='saml$(var.OpenSAMLFileVersion)D.dll' />
                 </Component>
                 <Component Id='samlsign.exe_debug' Guid='{A6588914-93E1-4FAF-B237-39C0240EECB1}' Win64='yes'>
-                  <File KeyPath='yes' Id='samlsign.exe_debug' Name='samlsign.exe' />
+                  <File KeyPath='yes' Checksum='yes' Id='samlsign.exe_debug' Name='samlsign.exe' />
                 </Component>
                 <Component Id='xmltoolingD.dll' Guid='{C380627F-9D45-4626-A249-3831FC7C83FC}' Win64='yes'>
-                  <File KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Debug\xmltooling$(var.XmlToolingFileVersion)D.dll' />
+                  <File KeyPath='yes' Checksum='yes'
+                    Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Debug\xmltooling$(var.XmlToolingFileVersion)D.dll' />
                 </Component>
-                <Component Id='xmltoolingliteD.dll' Guid='{2786A98E-763C-41A1-A6D5-363DB22F17E9}' Win64='yes'>
-                  <File KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />
+                <Component Id='xmltooling_liteD.dll' Guid='{2786A98E-763C-41A1-A6D5-363DB22F17E9}' Win64='yes'>
+                  <File KeyPath='yes' Checksum='yes'
+                    Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />
                 </Component>
               </Directory> <!-- lib_debug -->
             </Directory><!-- lib -->
diff --git a/msi/WiX/MergeModules/OpenSAML-x86.wxs b/msi/WiX/MergeModules/OpenSAML-x86.wxs
index 12e7ea0..3964ee1 100644
--- a/msi/WiX/MergeModules/OpenSAML-x86.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-x86.wxs
@@ -30,31 +30,33 @@
           <Directory Id='shibboleth_SP' Name='SP'>
             <Directory Id='lib' Name='lib' FileSource='$(var.SPBuildDirectory)\cpp-opensaml\Release\'>
               <Component Id='saml.dll' Guid='{B52F8C71-2042-4CDF-A250-BD773985A2AB}'>
-                <File KeyPath='yes' Name='saml$(var.OpenSAMLFileVersion).dll' />
+                <File KeyPath='yes' Checksum='yes' Name='saml$(var.OpenSAMLFileVersion).dll' />
               </Component>
               <Component Id='samlsign.exe' Guid='{3DC7A431-9623-4283-BA07-444DB1C1F864}'>
-                <File KeyPath='yes' Name='samlsign.exe' />
+                <File KeyPath='yes' Checksum='yes' Name='samlsign.exe' />
               </Component>
               <Component Id='xmltooling.dll' Guid='{53533A59-A563-439D-B13D-A4D7090C42D3}'>
-                <File KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\Release\xmltooling$(var.XmlToolingFileVersion).dll' />
+                <File KeyPath='yes' Checksum='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\Release\xmltooling$(var.XmlToolingFileVersion).dll' />
               </Component>
-              <Component Id='xmltoolinglite.dll' Guid='{5045A722-D6D6-4E55-9196-CB7C50B4446F}'>
-                <File KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\Release\xmltooling-lite$(var.XmlToolingFileVersion).dll' />
+              <Component Id='xmltooling_lite.dll' Guid='{5045A722-D6D6-4E55-9196-CB7C50B4446F}'>
+                <File KeyPath='yes' Checksum='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\Release\xmltooling-lite$(var.XmlToolingFileVersion).dll' />
               </Component>
               <Directory Id='lib_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-opensaml\Debug\'>
                 <Component Id='samlD.dll' Guid='{7B934257-5F7F-428E-930E-A793A11573D7}'>
-                  <File KeyPath='yes' Name='saml$(var.OpenSAMLFileVersion)D.dll' />
+                  <File KeyPath='yes' Checksum='yes' Name='saml$(var.OpenSAMLFileVersion)D.dll' />
                 </Component>
                 <Component Id='samlsign.exe_debug' Guid='{EFCAEBC5-242F-416C-8F87-B7DD49C1AE29}'>
-                  <File KeyPath='yes' Id='samlsign.exe_debug' Name='samlsign.exe' />
+                  <File KeyPath='yes' Checksum='yes' Id='samlsign.exe_debug' Name='samlsign.exe' />
                 </Component>
                 <Component Id='xmltoolingD.dll' Guid='{380E59DF-24F8-4F60-97A7-CC67FB76B4CC}'>
-                  <File KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\Debug\xmltooling$(var.XmlToolingFileVersion)D.dll' />
+                  <File KeyPath='yes' Checksum='yes'
+                    Source='$(var.SPBuildDirectory)\cpp-xmltooling\Debug\xmltooling$(var.XmlToolingFileVersion)D.dll' />
                 </Component>
-                <Component Id='xmltoolingliteD.dll' Guid='{DB6D8737-4E3D-4C06-87F1-C59C7D7CB47A}'>
-                  <File KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />
+                <Component Id='xmltooling_liteD.dll' Guid='{DB6D8737-4E3D-4C06-87F1-C59C7D7CB47A}'>
+                  <File KeyPath='yes' Checksum='yes'
+                    Source='$(var.SPBuildDirectory)\cpp-xmltooling\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />
                 </Component>
-              </Directory> <!-- lib_debug -->
+              </Directory><!-- lib_debug -->
             </Directory><!-- lib -->
             <Directory Id='doc' Name='doc'>
               <Component Id='doc' Guid='{EEA99655-7A42-4D5D-AB64-AA7DD5A99409}'>
@@ -62,7 +64,7 @@
                 <File Name='OPENSAML.NOTICE' Source='$(var.SPBuildDirectory)\cpp-opensaml\doc\NOTICE.txt' />
                 <File Name='OPENSAML.README' Source='$(var.SPBuildDirectory)\cpp-opensaml\doc\README.txt' />
               </Component>
-            </Directory> <!-- doc -->
+            </Directory><!-- doc -->
           </Directory><!-- shibboleth_SP -->
         </Directory><!-- shibboleth -->
       </Directory><!-- ProgramFilesFolder -->
diff --git a/msi/WiX/MergeModules/OpenSSL-x64.wxs b/msi/WiX/MergeModules/OpenSSL-x64.wxs
index f3aca08..76048b7 100644
--- a/msi/WiX/MergeModules/OpenSSL-x64.wxs
+++ b/msi/WiX/MergeModules/OpenSSL-x64.wxs
@@ -29,23 +29,23 @@
           <Directory Id='shibboleth_sp' Name='SP'>
             <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll\' >
               <Component Id='libeay32.dll' Guid='{49ED7AFD-EB3D-4296-84BC-E40C0E40DE5D}' Win64='yes'>
-                <File KeyPath='yes' Name='libeay32_$(var.OpenSSLFileVersion).dll' />
+                <File KeyPath='yes' Checksum='yes' Name='libeay32_$(var.OpenSSLFileVersion).dll' />
               </Component>
               <Component Id='ssleay32.dll' Guid='{649A8C33-1F00-40BD-BBA4-0D8FD7C258CD}' Win64='yes'>
-                <File KeyPath='yes' Name='ssleay32_$(var.OpenSSLFileVersion).dll' />
+                <File KeyPath='yes' Checksum='yes' Name='ssleay32_$(var.OpenSSLFileVersion).dll' />
               </Component>
               <Component Id='openssl.exe' Guid='{AF6DBF01-02E0-4CA4-9466-2E95EAC1200E}' Win64='yes'>
-                <File KeyPath='yes' Name='openssl.exe' />
+                <File KeyPath='yes' Checksum='yes' Name='openssl.exe' />
               </Component>
               <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll.dbg\'>
-                <Component Id='libeay32.dll_debug' Guid='{77010CF4-1367-4E42-86EA-C29D72EDAEC5}' Win64='yes'>
-                  <File Id='libeay32.dll_debug' KeyPath='yes' Name='libeay32_$(var.OpenSSLFileVersion)D.dll' />
+                <Component Id='libeay32D.dll' Guid='{77010CF4-1367-4E42-86EA-C29D72EDAEC5}' Win64='yes'>
+                  <File KeyPath='yes' Checksum='yes' Name='libeay32_$(var.OpenSSLFileVersion)D.dll' />
                 </Component>
-                <Component Id='ssleay32.dll_debug' Guid='{52C30BD0-3769-4021-85F7-4AE539DCED41}' Win64='yes'>
-                  <File Id='ssleay32.dll_debug' KeyPath='yes' Name='ssleay32_$(var.OpenSSLFileVersion)D.dll' />
+                <Component Id='ssleay32D.dll' Guid='{52C30BD0-3769-4021-85F7-4AE539DCED41}' Win64='yes'>
+                  <File KeyPath='yes' Checksum='yes' Name='ssleay32_$(var.OpenSSLFileVersion)D.dll' />
                 </Component>
                 <Component Id='openssl.exe_debug' Guid='{3555958C-C30D-4829-BC17-936D2EEC3EA4}' Win64='yes'>
-                  <File Id='openssl.exe_debug' KeyPath='yes' Name='openssl.exe' />
+                  <File Id='openssl.exe_debug' KeyPath='yes' Checksum='yes' Name='openssl.exe' />
                 </Component>
               </Directory><!-- lib_debug-->
             </Directory><!-- lib -->
diff --git a/msi/WiX/MergeModules/OpenSSL-x86.wxs b/msi/WiX/MergeModules/OpenSSL-x86.wxs
index cd07b8b..73e9c00 100644
--- a/msi/WiX/MergeModules/OpenSSL-x86.wxs
+++ b/msi/WiX/MergeModules/OpenSSL-x86.wxs
@@ -29,23 +29,23 @@
           <Directory Id='shibboleth_sp' Name='SP'>
             <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll\'>
               <Component Id='libeay32.dll' Guid='{38378D46-4CF2-4DE5-A30D-79F92AD6DD06}'>
-                <File KeyPath='yes' Name='libeay32_$(var.OpenSSLFileVersion).dll' />
+                <File KeyPath='yes' Checksum='yes' Name='libeay32_$(var.OpenSSLFileVersion).dll' />
               </Component>
               <Component Id='ssleay32.dll' Guid='{9C1CAE5E-F8E9-4EBA-961B-1DD149097702}'>
-                <File KeyPath='yes' Name='ssleay32_$(var.OpenSSLFileVersion).dll' />
+                <File KeyPath='yes' Checksum='yes' Name='ssleay32_$(var.OpenSSLFileVersion).dll' />
               </Component>
               <Component Id='openssl.exe' Guid='{886F0254-AD10-45C6-A723-37C7FA466651}'>
-                <File KeyPath='yes' Name='openssl.exe' />
+                <File KeyPath='yes' Checksum='yes' Name='openssl.exe' />
               </Component>
               <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll.dbg\' >
-                <Component Id='libeay32.dll_debug' Guid='{86C4099A-1E75-4676-8F6D-BF5748F657B6}'>
-                  <File Id='libeay32.dll_debug' KeyPath='yes' Name='libeay32_$(var.OpenSSLFileVersion)D.dll' />
+                <Component Id='libeay32D.dll' Guid='{86C4099A-1E75-4676-8F6D-BF5748F657B6}'>
+                  <File KeyPath='yes' Checksum='yes' Name='libeay32_$(var.OpenSSLFileVersion)D.dll' />
                 </Component>
-                <Component Id='ssleay32.dll_debug' Guid='{2097A37D-650E-45F4-96C0-94C748DEA49C}'>
-                  <File Id='ssleay32.dll_debug' KeyPath='yes' Name='ssleay32_$(var.OpenSSLFileVersion)D.dll' />
+                <Component Id='ssleay32D.dll' Guid='{2097A37D-650E-45F4-96C0-94C748DEA49C}'>
+                  <File KeyPath='yes' Checksum='yes' Name='ssleay32_$(var.OpenSSLFileVersion)D.dll' />
                 </Component>
                 <Component Id='openssl.exe_debug' Guid='{D47E4692-F648-4800-BE4A-9D84DAD5DEEA}'>
-                  <File Id='openssl.exe_debug' KeyPath='yes' Name='openssl.exe' />
+                  <File Id='openssl.exe_debug' KeyPath='yes' Checksum='yes' Name='openssl.exe' />
                 </Component>
               </Directory><!-- lib_debug-->
             </Directory><!-- lib -->
diff --git a/msi/WiX/MergeModules/Shibboleth-schemas.wxs b/msi/WiX/MergeModules/Shibboleth-schemas.wxs
index 2e10fa1..d866cb3 100644
--- a/msi/WiX/MergeModules/Shibboleth-schemas.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-schemas.wxs
@@ -18,8 +18,8 @@
 <?include ..\Versions.wxi ?>
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-  <Module Id='Shibboleth_schemas' Language='1033' Version='$(var.ShibbolethDllVersion)'>
-    <Package Id='{5AC5161D-114D-4BFB-AF7C-4E8E7F964965}' Description='Merge Module for Shibboleth schemas'
+  <Module Id='ShibbolethSPSchemasMergeModule' Language='1033' Version='$(var.ShibbolethDllVersion)'>
+    <Package Id='{5AC5161D-114D-4BFB-AF7C-4E8E7F964965}' Description='Merge Module for Shibboleth SP schemas'
              Comments='This module is built by the Shibboleth Consortium.'
              Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>
 
@@ -28,40 +28,39 @@
         <Directory Id='Shibboleth' Name='Shibboleth' >
           <Directory Id='SP' Name='SP' >
             <Directory Id='xml' Name='xml' >
-              <Directory Id='xml_shibboleth' Name='shibboleth'
-                         FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\schemas' >
-                <Component Id='share_xml_shibboleth' Guid='{E2740531-4A6C-43C8-9E1A-9F7CA87862B7}'>
-                  <File Name='shibboleth-metadata-1.0.xsd' KeyPath='yes' />
-                </Component>
+              <Directory Id='xml_shibboleth' Name='shibboleth' FileSource='$(var.SPBuildDirectory)\cpp-sp\schemas' >
                 <Component Id='catalog.xml' Guid='{C6EA59A2-0A86-4F5F-B5F8-E37A2310A793}'>
-                  <File Id='ShibbolethCatalog' Name='catalog.xml' Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\schemas\catalog.xml.in' />
+                  <File KeyPath='yes' Name='catalog.xml' Source='$(var.SPBuildDirectory)\cpp-sp\schemas\catalog.xml.in' />
                 </Component>
-                <Component Id='attributemap.xsd' Guid='{58A966DC-94E0-45FF-9A31-C67BAE0AB1C1}'>
-                  <File Name='shibboleth-2.0-attribute-map.xsd' />
+                <Component Id='shibboleth.xsd' Guid='{18F3DD83-0C0A-480E-8C87-043C9296DFE5}'>
+                  <File KeyPath='yes' Name='shibboleth.xsd' />
                 </Component>
-                <Component Id='afp.xsd' Guid='{9672ADDF-8053-41C3-A58A-C8B99C710336}'>
-                  <File Name='shibboleth-2.0-afp.xsd' />
+                <Component Id='metadata_1.0.xsd' Guid='{E2740531-4A6C-43C8-9E1A-9F7CA87862B7}'>
+                  <File KeyPath='yes' Id='metadata_1.0.xsd' Name='shibboleth-metadata-1.0.xsd' />
                 </Component>
-                <Component Id='afpmfsaml.xsd' Guid='{40B8AEF3-0A31-4204-95E7-F8079CB55979}'>
-                  <File Name='shibboleth-2.0-afp-mf-saml.xsd' />
+                <Component Id='attribute_map.xsd' Guid='{58A966DC-94E0-45FF-9A31-C67BAE0AB1C1}'>
+                  <File KeyPath='yes' Id='attribute_map.xsd' Name='shibboleth-2.0-attribute-map.xsd' />
                 </Component>
-                <Component Id='WSTrust.xsd' Guid='{91EA82B5-A19C-40C0-8D1C-40FA020A484E}'>
-                  <File Name='WS-Trust.xsd' />
+                <Component Id='afp.xsd' Guid='{9672ADDF-8053-41C3-A58A-C8B99C710336}'>
+                  <File KeyPath='yes' Id='afp.xsd' Name='shibboleth-2.0-afp.xsd' />
+                </Component>
+                <Component Id='afp_mf_basic.xsd' Guid='{D1C32485-D3DF-414C-B2FF-721F169CAC05}'>
+                  <File KeyPath='yes' Id='afp_mf_basic.xsd' Name='shibboleth-2.0-afp-mf-basic.xsd' />
                 </Component>
-                <Component Id='spnotify.xsd' Guid='{65EBC9F1-C958-4B17-9554-7F86186A15C1}'>
-                  <File Name='shibboleth-2.0-sp-notify.xsd' />
+                <Component Id='afp_mf_saml.xsd' Guid='{40B8AEF3-0A31-4204-95E7-F8079CB55979}'>
+                  <File KeyPath='yes' Id='afp_mf_saml.xsd' Name='shibboleth-2.0-afp-mf-saml.xsd' />
                 </Component>
-                <Component Id='nativespconfig.xsd' Guid='{5514B435-94AB-4A92-9737-0BEB78C146C8}'>
-                  <File Name='shibboleth-2.0-native-sp-config.xsd' />
+                <Component Id='WSTrust.xsd' Guid='{91EA82B5-A19C-40C0-8D1C-40FA020A484E}'>
+                  <File KeyPath='yes' Name='WS-Trust.xsd' />
                 </Component>
-                <Component Id='afpmfbasic.xsd' Guid='{D1C32485-D3DF-414C-B2FF-721F169CAC05}'>
-                  <File Name='shibboleth-2.0-afp-mf-basic.xsd' />
+                <Component Id='sp_notify.xsd' Guid='{65EBC9F1-C958-4B17-9554-7F86186A15C1}'>
+                  <File KeyPath='yes' Id='sp_notify.xsd' Name='shibboleth-2.0-sp-notify.xsd' />
                 </Component>
-                <Component Id='nativespprotocols' Guid='{AE42FFFB-1A59-4F1D-9935-15D727B99929}'>
-                  <File Id='nativespprotocols' Name='shibboleth-2.0-native-sp-protocols.xsd' />
+                <Component Id='native_sp_config.xsd' Guid='{5514B435-94AB-4A92-9737-0BEB78C146C8}'>
+                  <File KeyPath='yes' Id='native_sp_config.xsd' Name='shibboleth-2.0-native-sp-config.xsd' />
                 </Component>
-                <Component Id='shibboleth.xsd' Guid='{18F3DD83-0C0A-480E-8C87-043C9296DFE5}'>
-                  <File Name='shibboleth.xsd' KeyPath='yes' />
+                <Component Id='native_sp_protocols.xsd' Guid='{AE42FFFB-1A59-4F1D-9935-15D727B99929}'>
+                  <File KeyPath='yes' Id='native_sp_protocols.xsd' Name='shibboleth-2.0-native-sp-protocols.xsd' />
                 </Component>
               </Directory><!--xml_shibboleth-->
             </Directory><!--xml-->
@@ -69,29 +68,15 @@
         </Directory><!--Shibboleth-->
       </Directory><!--CommonAppDataFolder-->
     </Directory><!--TargetDir-->
-
+    <Binary Id='EditCatalogFileSrc' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\scripts\shib_edit_catalog.vbs' />
     <CustomAction Id='EditShibbolethCatalog' BinaryKey='EditCatalogFileSrc' VBScriptCall='' 
                   Execute='deferred' Impersonate='no' />
     <CustomAction Id='SetEditShibbolethCatalog' Property='EditShibbolethCatalog' 
                   Value='[CommonAppDataFolder]Shibboleth\SP\xml\shibboleth\;@;catalog.xml' />
-
-
     <InstallExecuteSequence>
-      <Custom Action='SetEditCatalogSAML10' Before='CostInitialize'>NOT Installed</Custom>
-      <Custom Action='EditCatalogSAML10' After='InstallFiles'>NOT Installed</Custom>
-      <Custom Action='SetEditCatalogSAML11' Before='CostInitialize'>NOT Installed</Custom>
-      <Custom Action='EditCatalogSAML11' After='InstallFiles'>NOT Installed</Custom>
-      <Custom Action='SetEditCatalogSAML20' Before='CostInitialize'>NOT Installed</Custom>
-      <Custom Action='EditCatalogSAML20' After='InstallFiles'>NOT Installed</Custom>
-
-      <Custom Action='SetEditXMLToolingCatalog' Before='CostInitialize'>NOT Installed</Custom>
-      <Custom Action='EditXMLToolingCatalog' After='InstallFiles'>NOT Installed</Custom>
-
       <Custom Action='SetEditShibbolethCatalog' Before='CostInitialize'>NOT Installed</Custom>
       <Custom Action='EditShibbolethCatalog' After='InstallFiles'>NOT Installed</Custom>
     </InstallExecuteSequence>
 
-
-
   </Module>
 </Wix>
diff --git a/msi/WiX/MergeModules/Shibboleth-x64.wxs b/msi/WiX/MergeModules/Shibboleth-x64.wxs
index 3a7bc7d..006523f 100644
--- a/msi/WiX/MergeModules/Shibboleth-x64.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-x64.wxs
@@ -19,7 +19,7 @@
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Module Id='ShibbolethSPMergeModule_x64' Language='1033' Version='$(var.ShibbolethDllVersion)'>
-    <Package Id='{DF6FAD40-5EF8-43F2-BBE1-BD42B9E9ACAB}' Description='Merge Module for Shibboleth DLLs (x64)'
+    <Package Id='{DF6FAD40-5EF8-43F2-BBE1-BD42B9E9ACAB}' Description='Merge Module for Shibboleth SP DLLs (x64)'
              Comments='This module is built by the Shibboleth Consortium.'
              Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>
 
@@ -27,25 +27,28 @@
       <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>
         <Directory Id='shibboleth' Name='Shibboleth'>
           <Directory Id='shibboleth_sp' Name='SP'>
-            <Directory Id='lib' Name='lib' 
-                       FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\x64\Release'>
-              <Component Id='shibsplite.dll' Guid='{2D6A6399-62A6-4BF6-8D58-82E1EFE8C65E}' Win64='yes'>
-                <File Name='shibsp-lite$(var.ShibbolethDllFileVersion).dll' KeyPath='yes' />
-              </Component>
+            <Directory Id='lib' Name='lib' FileSource='$(var.SPBuildDirectory)\cpp-sp\x64\Release'>
               <Component Id='shibsp.dll' Guid='{B7DE652A-6853-4389-AD47-5DBB5AC89BDB}' Win64='yes'>
-                <File Name='shibsp$(var.ShibbolethDllFileVersion).dll' KeyPath='yes' />
+                <File KeyPath='yes' Checksum='yes' Name='shibsp$(var.ShibbolethDllFileVersion).dll' />
               </Component>
-              <Directory Id='lib_debug' Name='debug' 
-                         FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\x64\Debug' >
-                <Component Id='shibspliteD.dll' Guid='{5EF6FF17-0510-484B-9F24-523B29EB416C}' Win64='yes'>
-                  <File Name='shibsp-lite$(var.ShibbolethDllFileVersion)D.dll' KeyPath='yes' />
-                </Component>
+              <Component Id='shibsp_lite.dll' Guid='{2D6A6399-62A6-4BF6-8D58-82E1EFE8C65E}' Win64='yes'>
+                <File KeyPath='yes' Checksum='yes' Name='shibsp-lite$(var.ShibbolethDllFileVersion).dll' />
+              </Component>
+              <Directory Id='lib_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\x64\Debug' >
                 <Component Id='shibspD.dll' Guid='{222ED92E-DD0B-410E-9A90-D1DD1AA878CF}' Win64='yes'>
-                  <File Name='shibsp$(var.ShibbolethDllFileVersion)D.dll' KeyPath='yes' />
+                  <File KeyPath='yes' Checksum='yes' Name='shibsp$(var.ShibbolethDllFileVersion)D.dll' />
+                </Component>
+                <Component Id='shibsp_liteD.dll' Guid='{5EF6FF17-0510-484B-9F24-523B29EB416C}' Win64='yes'>
+                  <File KeyPath='yes' Checksum='yes' Name='shibsp-lite$(var.ShibbolethDllFileVersion)D.dll' />
                 </Component>
               </Directory><!-- lib_debug -->
             </Directory><!-- lib -->
-            <Directory Id='doc' Name='doc' />
+            <Directory Id='doc' Name='doc'>
+              <Component Id='doc' Guid='{1ACB430F-7846-4565-93FE-3BE1BC1235C1}' Win64='yes'>
+                <File KeyPath='yes' Name='SHIBBOLETH.LICENSE' Source='$(var.SPBuildDirectory)\cpp-sp\doc\LICENSE.txt' />
+                <File Name='SHIBBOLETH.NOTICE' Source='$(var.SPBuildDirectory)\cpp-sp\doc\NOTICE.txt' />
+              </Component>
+            </Directory><!-- doc -->
           </Directory><!-- shibboleth_sp -->
         </Directory><!-- shibboleth -->
       </Directory><!-- ProgramFiles64Folder -->
diff --git a/msi/WiX/MergeModules/Shibboleth-x86.wxs b/msi/WiX/MergeModules/Shibboleth-x86.wxs
index 4113a21..90b5cc6 100644
--- a/msi/WiX/MergeModules/Shibboleth-x86.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-x86.wxs
@@ -19,7 +19,7 @@
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Module Id='ShibbolethSPMergeModule_x86' Language='1033' Version='$(var.ShibbolethDllVersion)'>
-    <Package Id='{AD8C7CB1-94D5-4C8E-88D0-040F817E1802}' Description='Merge Module for Shibboleth DLLs (x86)'
+    <Package Id='{AD8C7CB1-94D5-4C8E-88D0-040F817E1802}' Description='Merge Module for Shibboleth SP DLLs (x86)'
              Comments='This module is built by the Shibboleth Consortium.'
              Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>
 
@@ -27,30 +27,31 @@
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
         <Directory Id='shibboleth' Name='Shibboleth'>
           <Directory Id='shibboleth_sp' Name='SP'>
-            <Directory Id='lib' Name='lib' 
-                       FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Release'>
-              <Component Id='shibsplite.dll' Guid='{10475E33-434D-4805-B983-195092549BED}'>
-                <File Name='shibsp-lite$(var.ShibbolethDllFileVersion).dll' KeyPath='yes' />
-              </Component>
+            <Directory Id='lib' Name='lib' FileSource='$(var.SPBuildDirectory)\cpp-sp\Release'>
               <Component Id='shibsp.dll' Guid='{9DE384BF-C286-4A72-AED9-AA34384005C0}'>
-                <File Name='shibsp$(var.ShibbolethDllFileVersion).dll' KeyPath='yes' />
+                <File KeyPath='yes' Checksum='yes' Name='shibsp$(var.ShibbolethDllFileVersion).dll' />
               </Component>
-              <Directory Id='lib_debug' Name='debug' 
-                         FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Debug' >
-                <Component Id='shibspliteD.dll' Guid='{8E070220-2992-4D45-BF98-459022CD268F}'>
-                  <File Name='shibsp-lite$(var.ShibbolethDllFileVersion)D.dll' KeyPath='yes' />
-                </Component>
+              <Component Id='shibsp_lite.dll' Guid='{10475E33-434D-4805-B983-195092549BED}'>
+                <File KeyPath='yes' Checksum='yes' Name='shibsp-lite$(var.ShibbolethDllFileVersion).dll' />
+              </Component>
+              <Directory Id='lib_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\Debug' >
                 <Component Id='shibspD.dll' Guid='{4196D799-1162-4D62-9F7A-1F59E90F19F1}'>
-                  <File Name='shibsp$(var.ShibbolethDllFileVersion)D.dll' KeyPath='yes' />
+                  <File KeyPath='yes' Checksum='yes' Name='shibsp$(var.ShibbolethDllFileVersion)D.dll' />
+                </Component>
+                <Component Id='shibsp_liteD.dll' Guid='{8E070220-2992-4D45-BF98-459022CD268F}'>
+                  <File KeyPath='yes' Checksum='yes' Name='shibsp-lite$(var.ShibbolethDllFileVersion)D.dll' />
                 </Component>
               </Directory><!-- lib_debug -->
             </Directory><!-- lib -->
-            <Directory Id='doc' Name='doc'/>
+            <Directory Id='doc' Name='doc'>
+              <Component Id='doc' Guid='{6FB48AD9-2D14-46F5-A826-2DB2E604B5BB}'>
+                <File KeyPath='yes' Name='SHIBBOLETH.LICENSE' Source='$(var.SPBuildDirectory)\cpp-sp\doc\LICENSE.txt' />
+                <File Name='SHIBBOLETH.NOTICE' Source='$(var.SPBuildDirectory)\cpp-sp\doc\NOTICE.txt' />
+              </Component>
+            </Directory><!-- doc -->
           </Directory><!-- shibboleth_sp -->
         </Directory><!-- shibboleth -->
       </Directory><!-- ProgramFilesFolder -->
     </Directory><!-- TARGETDIR -->
   </Module>
 </Wix>
-
-    
diff --git a/msi/WiX/MergeModules/Xerces-x64.wxs b/msi/WiX/MergeModules/Xerces-x64.wxs
index 8ac8463..e3893f5 100644
--- a/msi/WiX/MergeModules/Xerces-x64.wxs
+++ b/msi/WiX/MergeModules/Xerces-x64.wxs
@@ -27,15 +27,14 @@
       <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>
         <Directory Id='shibboleth' Name='Shibboleth'>
           <Directory Id='shibboleth_sp' Name='SP'>
-            
             <Directory Id='lib' Name='lib'>
               <Component Id='xercesc.dll' Guid='{5C2BA2C6-36EC-4EB3-A343-8C1C9D499B9C}' Win64='yes'>
-                <File Id='xercesc.dll' KeyPath='yes'
+                <File KeyPath='yes' Checksum='yes'
                       Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86_64-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion).dll'/>
               </Component>
               <Directory Id='lib_debug' Name='debug'>
                 <Component Id='xercescD.dll' Guid='{236B6A7F-73C0-4EBF-9C06-90C1BE160ACE}' Win64='yes'>
-                  <File Id='xercescD.dll' KeyPath='yes'
+                  <File KeyPath='yes' Checksum='yes'
                         Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86_64-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion)D.dll'/>
                 </Component>
               </Directory><!-- lib_debug-->
@@ -52,5 +51,3 @@
     </Directory><!-- TARGETDIR -->
   </Module>
 </Wix>
-
-    
diff --git a/msi/WiX/MergeModules/Xerces-x86.wxs b/msi/WiX/MergeModules/Xerces-x86.wxs
index 20a3202..5807820 100644
--- a/msi/WiX/MergeModules/Xerces-x86.wxs
+++ b/msi/WiX/MergeModules/Xerces-x86.wxs
@@ -27,15 +27,14 @@
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
         <Directory Id='shibboleth' Name='Shibboleth'>
           <Directory Id='shibboleth_sp' Name='SP'>
-            
             <Directory Id='lib' Name='lib'>
               <Component Id='xercesc.dll' Guid='{64C16FA9-685C-4612-B9C2-0B56C84A69E1}'>
-                <File Id='xercesc.dll' KeyPath='yes'
+                <File KeyPath='yes' Checksum='yes'
                       Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion).dll'/>
               </Component>
               <Directory Id='lib_debug' Name='debug'>
                 <Component Id='xercescD.dll' Guid='{3F92209F-35C7-4D7C-BAC3-B0A96DF0CBDF}'>
-                  <File Id='xercescD.dll' KeyPath='yes'
+                  <File KeyPath='yes' Checksum='yes'
                         Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion)D.dll'/>
                 </Component>
               </Directory><!-- lib_debug-->
@@ -52,5 +51,3 @@
     </Directory><!-- TARGETDIR -->
   </Module>
 </Wix>
-
-    
diff --git a/msi/WiX/MergeModules/XmlSec-x64.wxs b/msi/WiX/MergeModules/XmlSec-x64.wxs
index 685f609..57552a8 100644
--- a/msi/WiX/MergeModules/XmlSec-x64.wxs
+++ b/msi/WiX/MergeModules/XmlSec-x64.wxs
@@ -30,54 +30,55 @@
             <Directory Id='lib' Name='lib' 
                        FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Release No Xalan'>
               <Component Id='xsec.dll' Guid='{3EB5B168-1FB1-476D-8E7C-2469D9B55162}' Win64='yes'>
-                <File KeyPath='yes' Name='xsec_$(var.XmlSecFileVersion).dll'/>
+                <File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion).dll'/>
               </Component>
               <Component Id='c14n.exe' Guid='{DE820D93-BC4F-48B5-9C1F-3CD34E34D10C}' Win64='yes'>
-                <File KeyPath='yes' Name='c14n.exe'/>
+                <File KeyPath='yes' Checksum='yes' Name='c14n.exe'/>
               </Component>
               <Component Id='checksig.exe' Guid='{D2145F4D-95FA-4A24-B06C-D37AF36ADDD2}' Win64='yes'>
-                <File KeyPath='yes' Name='checksig.exe'/>
+                <File KeyPath='yes' Checksum='yes' Name='checksig.exe'/>
               </Component>
               <Component Id='cipher.exe' Guid='{192AEEF7-3AE2-4570-AA30-1A2046646A84}' Win64='yes'>
-                <File KeyPath='yes' Name='cipher.exe'/>
+                <File KeyPath='yes' Checksum='yes' Name='cipher.exe'/>
               </Component>
               <Component Id='siginf.exe' Guid='{7C15D545-DDB9-4D02-AE9C-4C9E0229FC72}' Win64='yes'>
-                <File KeyPath='yes' Name='siginf.exe'/>
+                <File KeyPath='yes' Checksum='yes' Name='siginf.exe'/>
               </Component>
               <Component Id='templatesign.exe' Guid='{71B603E6-A54B-4843-A4F8-826AD4CA6A04}' Win64='yes'>
-                <File KeyPath='yes' Name='templatesign.exe'/>
+                <File KeyPath='yes' Checksum='yes' Name='templatesign.exe'/>
               </Component>
               <Component Id='txfmout.exe' Guid='{2D9025EE-D95F-4D3C-B0E7-86D742749D39}' Win64='yes'>
-                <File KeyPath='yes' Name='txfmout.exe'/>
+                <File KeyPath='yes' Checksum='yes' Name='txfmout.exe'/>
               </Component>
               <Directory Id='lib_debug' Name='debug' 
                          FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Debug No Xalan'>
                 <Component Id='xsecD.dll' Guid='{EC1CCD0D-028D-4C92-846D-88C1C24B66E6}' Win64='yes'>
-                  <File KeyPath='yes' Name='xsec_$(var.XmlSecFileVersion)D.dll'/>
+                  <File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion)D.dll'/>
                 </Component>
                 <Component Id='c14n.exe_debug' Guid='{ED9BB341-C5D2-4234-B720-483D86D340F9}' Win64='yes'>
-                  <File Id='c14n.exe_debug' KeyPath='yes' Name='c14n.exe'/>
+                  <File Id='c14n.exe_debug' KeyPath='yes' Checksum='yes' Name='c14n.exe'/>
                 </Component>
                 <Component Id='checksig.exe_debug' Guid='{F6618EE1-A5BD-4EC5-9257-E62015DC3BC4}' Win64='yes'>
-                  <File Id='checksig.exe_debug' KeyPath='yes' Name='checksig.exe'/>
+                  <File Id='checksig.exe_debug' KeyPath='yes' Checksum='yes' Name='checksig.exe'/>
                 </Component>
                 <Component Id='cipher.exe_debug' Guid='{EAB5FF33-9EBD-4C55-8D64-F975E5B11785}' Win64='yes'>
-                  <File Id='cipher.exe_debug' KeyPath='yes' Name='cipher.exe'/>
+                  <File Id='cipher.exe_debug' KeyPath='yes' Checksum='yes' Name='cipher.exe'/>
                 </Component>
                 <Component Id='siginf.exe_debug' Guid='{1EA9ABB6-2B33-4E4C-9210-B89FCC493E78}' Win64='yes'>
-                  <File Id='siginf.exe_debug' KeyPath='yes' Name='siginf.exe'/>
+                  <File Id='siginf.exe_debug' KeyPath='yes' Checksum='yes' Name='siginf.exe'/>
                 </Component>
                 <Component Id='templatesign.exe_debug' Guid='{5AE22CDB-625E-4DC7-9586-77C3DD835100}' Win64='yes'>
-                  <File Id='templatesign.exe_debug' KeyPath='yes' Name='templatesign.exe'/>
+                  <File Id='templatesign.exe_debug' KeyPath='yes' Checksum='yes' Name='templatesign.exe'/>
                 </Component>
                 <Component Id='txfmout.exe_debug' Guid='{373B4E3D-6643-4884-8D0C-324DEF910230}' Win64='yes'>
-                  <File Id='txfmout.exe_debug' KeyPath='yes' Name='txfmout.exe'/>
+                  <File Id='txfmout.exe_debug' KeyPath='yes' Checksum='yes' Name='txfmout.exe'/>
                 </Component>
               </Directory><!-- lib_debug-->
             </Directory><!-- lib -->
             <Directory Id='doc' Name='doc'>
               <Component Id='SANTUARIO.LICENSE' Guid='{07288B10-ED5A-443F-BC90-CFD987C798C4}'>
-                <File KeyPath='yes' Name='SANTUARIO.LICENSE' Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\LICENSE' />
+                <File KeyPath='yes' Name='SANTUARIO.LICENSE'
+                  Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\LICENSE.txt' />
               </Component>
             </Directory><!-- doc -->
           </Directory><!-- shibboleth_sp -->
@@ -86,5 +87,3 @@
     </Directory><!-- TARGETDIR -->
   </Module>
 </Wix> 
-
-  
diff --git a/msi/WiX/MergeModules/XmlSec-x86.wxs b/msi/WiX/MergeModules/XmlSec-x86.wxs
index ddfd94a..4ba13e7 100644
--- a/msi/WiX/MergeModules/XmlSec-x86.wxs
+++ b/msi/WiX/MergeModules/XmlSec-x86.wxs
@@ -30,54 +30,55 @@
             <Directory Id='lib' Name='lib' 
                        FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Release No Xalan'>
               <Component Id='xsec.dll' Guid='{8920023D-92CA-4012-8BF8-6D80D791375D}'>
-                <File KeyPath='yes' Name='xsec_$(var.XmlSecFileVersion).dll'/>
+                <File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion).dll'/>
               </Component>
               <Component Id='c14n.exe' Guid='{576EB311-AADA-49D3-B444-7EDC37C715F3}'>
-                <File KeyPath='yes' Name='c14n.exe'/>
+                <File KeyPath='yes' Checksum='yes' Name='c14n.exe'/>
               </Component>
               <Component Id='checksig.exe' Guid='{F0C2B97A-7B93-4CD3-9432-E5904D337815}'>
-                <File KeyPath='yes' Name='checksig.exe'/>
+                <File KeyPath='yes' Checksum='yes' Name='checksig.exe'/>
               </Component>
               <Component Id='cipher.exe' Guid='{654BB761-7B9D-4766-AC5F-DC174E7B94AE}'>
-                <File KeyPath='yes' Name='cipher.exe'/>
+                <File KeyPath='yes' Checksum='yes' Name='cipher.exe'/>
               </Component>
               <Component Id='siginf.exe' Guid='{1B278BD9-6507-4613-9315-8D47CAEBC3D8}'>
-                <File KeyPath='yes' Name='siginf.exe'/>
+                <File KeyPath='yes' Checksum='yes' Name='siginf.exe'/>
               </Component>
               <Component Id='templatesign.exe' Guid='{A24CD56C-F615-406E-B4E2-4AC5EAE99206}'>
-                <File KeyPath='yes' Name='templatesign.exe'/>
+                <File KeyPath='yes' Checksum='yes' Name='templatesign.exe'/>
               </Component>
               <Component Id='txfmout.exe' Guid='{667DD190-335B-4AB7-BBA5-25B5F847F363}'>
-                <File KeyPath='yes' Name='txfmout.exe'/>
+                <File KeyPath='yes' Checksum='yes' Name='txfmout.exe'/>
               </Component>
               <Directory Id='lib_debug' Name='debug' 
                          FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Debug No Xalan'>
                 <Component Id='xsecD.dll' Guid='{9FF121C0-9C75-428E-A8A2-5DD0F499CA73}'>
-                  <File KeyPath='yes' Name='xsec_$(var.XmlSecFileVersion)D.dll'/>
+                  <File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion)D.dll'/>
                 </Component>
                 <Component Id='c14n.exe_debug' Guid='{20506FEA-CCFF-46A2-9753-DBBA8A967003}'>
-                  <File Id='c14n.exe_debug' KeyPath='yes' Name='c14n.exe'/>
+                  <File Id='c14n.exe_debug' KeyPath='yes' Checksum='yes' Name='c14n.exe'/>
                 </Component>
                 <Component Id='checksig.exe_debug' Guid='{6C2A1FC2-73F0-4EAE-A2CA-9C27A102E460}'>
-                  <File Id='checksig.exe_debug' KeyPath='yes' Name='checksig.exe'/>
+                  <File Id='checksig.exe_debug' KeyPath='yes' Checksum='yes' Name='checksig.exe'/>
                 </Component>
                 <Component Id='cipher.exe_debug' Guid='{BE90D2A6-0776-4E48-87F2-6DDE79D8E167}'>
-                  <File Id='cipher.exe_debug' KeyPath='yes' Name='cipher.exe'/>
+                  <File Id='cipher.exe_debug' KeyPath='yes' Checksum='yes' Name='cipher.exe'/>
                 </Component>
                 <Component Id='siginf.exe_debug' Guid='{D94E92D1-7B48-4FB2-A2B7-CC253FE27B7F}'>
-                  <File Id='siginf.exe_debug' KeyPath='yes' Name='siginf.exe'/>
+                  <File Id='siginf.exe_debug' KeyPath='yes' Checksum='yes' Name='siginf.exe'/>
                 </Component>
                 <Component Id='templatesign.exe_debug' Guid='{5E8264B4-D759-4502-B989-5A5C56FBD875}'>
-                  <File Id='templatesign.exe_debug' KeyPath='yes' Name='templatesign.exe'/>
+                  <File Id='templatesign.exe_debug' KeyPath='yes' Checksum='yes' Name='templatesign.exe'/>
                 </Component>
                 <Component Id='txfmout.exe_debug' Guid='{FCBFBCAA-5C39-470A-BD58-E558C384898D}'>
-                  <File Id='txfmout.exe_debug' KeyPath='yes' Name='txfmout.exe'/>
+                  <File Id='txfmout.exe_debug' KeyPath='yes' Checksum='yes' Name='txfmout.exe'/>
                 </Component>
               </Directory><!-- lib_debug-->
             </Directory><!-- lib -->
             <Directory Id='doc' Name='doc'>
               <Component Id='SANTUARIO.LICENSE' Guid='{FF81AD29-36DF-42BD-AFC9-211F083D9872}'>
-                <File KeyPath='yes' Name='SANTUARIO.LICENSE' Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\LICENSE' />
+                <File KeyPath='yes' Name='SANTUARIO.LICENSE'
+                  Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\LICENSE.txt' />
               </Component>
             </Directory><!-- doc -->
           </Directory><!-- shibboleth_sp -->
@@ -86,5 +87,3 @@
     </Directory><!-- TARGETDIR -->
   </Module>
 </Wix> 
-
-  
diff --git a/msi/WiX/MergeModules/Zlib-x64.wxs b/msi/WiX/MergeModules/Zlib-x64.wxs
index 7729850..90c217e 100644
--- a/msi/WiX/MergeModules/Zlib-x64.wxs
+++ b/msi/WiX/MergeModules/Zlib-x64.wxs
@@ -29,12 +29,12 @@
           <Directory Id='shibboleth_sp' Name='SP'>
             <Directory Id='lib' Name='lib'>
               <Component Id='zlib1.dll' Guid='{792D44C3-3DCE-465D-AAFF-520AB2F20DA2}' Win64='yes'>
-                <File KeyPath='yes'
+                <File KeyPath='yes' Checksum='yes'
                       Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\projects\visualc6\Win64_DLL_Release\zlib$(var.ZlibFileVersion).dll'/>
               </Component>
               <Directory Id='lib_debug' Name='debug'>
                 <Component Id='zlib1d.dll' Guid='{74D67C6F-655E-4E4D-A147-39F32DB6E796}' Win64='yes'>
-                  <File Id='zlib1d.dll' KeyPath='yes' 
+                  <File KeyPath='yes' Checksum='yes'
                         Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\projects\visualc6\Win64_DLL_Debug\zlib$(var.ZlibFileVersion)d.dll'/>
                 </Component>
               </Directory><!-- lib_debug-->
@@ -45,5 +45,3 @@
     </Directory><!-- TARGETDIR -->
   </Module>
 </Wix>
-
-    
diff --git a/msi/WiX/MergeModules/Zlib-x86.wxs b/msi/WiX/MergeModules/Zlib-x86.wxs
index b9611bf..e50d5a6 100644
--- a/msi/WiX/MergeModules/Zlib-x86.wxs
+++ b/msi/WiX/MergeModules/Zlib-x86.wxs
@@ -29,12 +29,12 @@
           <Directory Id='shibboleth_sp' Name='SP'>
             <Directory Id='lib' Name='lib'>
               <Component Id='zlib1.dll' Guid='{059557A8-7311-47BB-8A5F-CC85F72AE495}'>
-                <File KeyPath='yes'
+                <File KeyPath='yes' Checksum='yes'
                       Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\projects\visualc6\Win32_DLL_Release\zlib$(var.ZlibFileVersion).dll'/>
               </Component>
               <Directory Id='lib_debug' Name='debug'>
                 <Component Id='zlib1d.dll' Guid='{3DA71CD4-F204-49D5-A689-7B1B4C2D395A}'>
-                  <File Id='zlib1d.dll' KeyPath='yes' 
+                  <File KeyPath='yes' Checksum='yes'
                         Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\projects\visualc6\Win32_DLL_Debug\zlib$(var.ZlibFileVersion)d.dll'/>
                 </Component>
               </Directory><!-- lib_debug-->
@@ -45,5 +45,3 @@
     </Directory><!-- TARGETDIR -->
   </Module>
 </Wix>
-
-    
diff --git a/msi/WiX/MergeModules/tes.wxs b/msi/WiX/MergeModules/tes.wxs
index db9759e..79f7a96 100644
--- a/msi/WiX/MergeModules/tes.wxs
+++ b/msi/WiX/MergeModules/tes.wxs
@@ -27,61 +27,55 @@
     <!-- Files -->
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFilesFolder' >
-        <Merge Id='OpenSAML-schemas' Language='1033' SourceFile='.\OpenSAML-schemas.msm' DiskId='1' />
-
-        <Merge Id='OpenSAML-32' Language='1033' SourceFile='.\OpenSAML-x86.msm' DiskId='1' /> 
-        <Merge Id='OpenSSL-32' Language='1033' SourceFile='.\OpenSSL-x86.msm' DiskId='1' />
-        <Merge Id='XmlTooling-32' Language='1033' SourceFile='.\XmlTooling-x86.msm' DiskId='1' /> 
-
-        <Merge Id='XmlTooling-Schemas' Language='1033' SourceFile='.\XmlTooling-schemas.msm' DiskId='1' />
         <Merge Id='Curl-32' Language='1033' SourceFile='.\Curl-x86.msm' DiskId='1' />
         <Merge Id='FastCGI-32' Language='1033' SourceFile='.\FastCGI-x86.msm' DiskId='1' />
         <Merge Id='Log4Shib-32' Language='1033' SourceFile='.\Log4Shib-x86.msm' DiskId='1' />
+        <Merge Id='OpenSAML-32' Language='1033' SourceFile='.\OpenSAML-x86.msm' DiskId='1' /> 
+        <Merge Id='OpenSSL-32' Language='1033' SourceFile='.\OpenSSL-x86.msm' DiskId='1' />
         <Merge Id='Shibboleth-32' Language='1033' SourceFile='.\Shibboleth-x86.msm' DiskId='1' />
         <Merge Id='Xerces-32' Language='1033' SourceFile='.\Xerces-x86.msm' DiskId='1' />
         <Merge Id='XmlSec-32' Language='1033' SourceFile='.\XmlSec-x86.msm' DiskId='1' />
         <Merge Id='Zlib-32' Language='1033' SourceFile='.\Zlib-x86.msm' DiskId='1' />
       </Directory>
-      <Directory Id='ProgramFiles64Folder' >
-        <Merge Id='OpenSSL-64' Language='1033' SourceFile='.\OpenSSL-x64.msm' DiskId='1' />
-        <Merge Id='OpenSAML-64' Language='1033' SourceFile='.\OpenSAML-x64.msm' DiskId='1' />
+      <Directory Id='ProgramFiles64Folder'>
         <Merge Id='Curl-64' Language='1033' SourceFile='.\Curl-x64.msm' DiskId='1' />
         <Merge Id='FastCGI-64' Language='1033' SourceFile='.\FastCGI-x64.msm' DiskId='1' />
         <Merge Id='Log4Shib-64' Language='1033' SourceFile='.\Log4Shib-x64.msm' DiskId='1' />
+        <Merge Id='OpenSAML-64' Language='1033' SourceFile='.\OpenSAML-x64.msm' DiskId='1' />
+        <Merge Id='OpenSSL-64' Language='1033' SourceFile='.\OpenSSL-x64.msm' DiskId='1' />
         <Merge Id='Shibboleth-64' Language='1033' SourceFile='.\Shibboleth-x64.msm' DiskId='1' />
         <Merge Id='Xerces-64' Language='1033' SourceFile='.\Xerces-x64.msm' DiskId='1' />
         <Merge Id='XmlSec-64' Language='1033' SourceFile='.\XmlSec-x64.msm' DiskId='1' />
-        <Merge Id='XmlTooling-64' Language='1033' SourceFile='.\XmlTooling-x64.msm' DiskId='1' />
         <Merge Id='Zlib-64' Language='1033' SourceFile='.\Zlib-x64.msm' DiskId='1' />
       </Directory>
+      <Directory Id='CommonAppDataFolder'>
+        <Merge Id='OpenSAML-schemas' Language='1033' SourceFile='.\OpenSAML-schemas.msm' DiskId='1' />
+        <Merge Id='Shibboleth-schemas' Language='1033' SourceFile='.\Shibboleth-schemas.msm' DiskId='1' />
+      </Directory>
     </Directory>
 
     <!-- Feature -->
     <Feature Id='MyFeature' Title='My 1st Feature' Level='1'>
-      <MergeRef Id='OpenSAML-schemas'/>
-      <MergeRef Id='OpenSAML-32'/> 
-      <MergeRef Id='OpenSSL-32'/>
-      <MergeRef Id='OpenSSL-64'/>
-      <MergeRef Id='OpenSAML-64'/>
       <MergeRef Id='Curl-32'/>
       <MergeRef Id='Curl-64'/>
       <MergeRef Id='FastCGI-32'/>
       <MergeRef Id='FastCGI-64'/>
-      <MergeRef Id='FastCGI-32'/>
-      <MergeRef Id='FastCGI-64'/>
       <MergeRef Id='Log4Shib-32'/>
       <MergeRef Id='Log4Shib-64'/>
+      <MergeRef Id='OpenSAML-schemas'/>
+      <MergeRef Id='OpenSAML-32'/> 
+      <MergeRef Id='OpenSAML-64'/>
+      <MergeRef Id='OpenSSL-32'/>
+      <MergeRef Id='OpenSSL-64'/>
+      <MergeRef Id='Shibboleth-schemas'/>
       <MergeRef Id='Shibboleth-32'/>
       <MergeRef Id='Shibboleth-64'/>
       <MergeRef Id='Xerces-32'/>
       <MergeRef Id='Xerces-64'/>
       <MergeRef Id='XmlSec-32'/>
       <MergeRef Id='XmlSec-64'/>
-      <MergeRef Id='XmlTooling-Schemas'/> 
-      <MergeRef Id='XmlTooling-64'/>
       <MergeRef Id='Zlib-32'/>
       <MergeRef Id='Zlib-64'/>
-      <MergeRef Id='XmlTooling-32'/>
     </Feature>
   </Product>
 </Wix>
diff --git a/msi/WiX/ShibbolethSP-defs-x86.wxi b/msi/WiX/ShibbolethSP-defs-x86.wxi
index c8cb2ed..6c24535 100644
--- a/msi/WiX/ShibbolethSP-defs-x86.wxi
+++ b/msi/WiX/ShibbolethSP-defs-x86.wxi
@@ -12,37 +12,38 @@
 
   <ComponentRef Id='openssl.cnf'/>
   <ComponentRef Id='upgrade.xsl'/>
-  <ComponentRef Id='examplemetadata.xml'/>
-  <ComponentRef Id='exampleshibboleth2.xml'/> 
+  <ComponentRef Id='example_metadata.xml'/>
+  <ComponentRef Id='example_shibboleth2.xml'/> 
   <ComponentRef Id='xsltproc.js'/>
   <ComponentRef Id='keygen.bat'/>
-
-  <ComponentRef Id='dist_noperm'/>
+  <ComponentRef Id='attrChecker.html'/>
   <ComponentRef Id='sslError.html'/>
   <ComponentRef Id='bindingTemplate.html'/>
   <ComponentRef Id='globalLogout.html'/>
   <ComponentRef Id='localLogout.html'/>
-  <ComponentRef Id='attributemap'/>
-  <ComponentRef Id='attributepolicy'/>
+  <ComponentRef Id='attribute_map.xml'/>
+  <ComponentRef Id='attribute_policy.xml'/>
   <ComponentRef Id='shibboleth2.xml'/>
   <ComponentRef Id='console.logger'/>
   <ComponentRef Id='discoveryTemplate.html'/>
   <ComponentRef Id='postTemplate.html'/>
   <ComponentRef Id='partialLogout.html'/>
   <ComponentRef Id='protocols.xml'/>
-  <ComponentRef Id='securitypolicy.xml'/>
-
+  <ComponentRef Id='security_policy.xml'/>
   <ComponentRef Id='accessError.html'/>
   <ComponentRef Id='apache.config'/>
   <ComponentRef Id='apache2.config'/>
+  <ComponentRef Id='apache22.config.in'/>
+  <ComponentRef Id='apache24.config.in'/>
   <ComponentRef Id='metadataError.html'/>
-  <ComponentRef Id='native.logger'/>
+  <ComponentRef Id='native.logger.in'/>
   <ComponentRef Id='sessionError.html'/>
-  <ComponentRef Id='shibd.logger'/>
+  <ComponentRef Id='shibd.logger.in'/>
+  <ComponentRef Id='var_cache_shibboleth_folder'/>
   <ComponentRef Id='var_log_shibboleth_folder'/>
   <ComponentRef Id='var_run_shibboleth_folder'/>
 
-  <!-- ShibbolethSP-exe-x64-->
+  <!-- ShibbolethSP-exe-x86-->
 
   <ComponentRef Id='resolvertest.exe'/>
   <ComponentRef Id='mdquery.exe'/>
@@ -55,24 +56,28 @@
   <ComponentRef Id='mod_shib_13.so'/>
   <ComponentRef Id='mod_shib_20.so'/>
   <ComponentRef Id='mod_shib_22.so'/>
+  <ComponentRef Id='mod_shib_24.so'/>
   <ComponentRef Id='nsapi_shib.dll'/>
-  <ComponentRef Id='odbcstore.so'/>
+  <ComponentRef Id='odbc_store.so'/>
+  <ComponentRef Id='plugins.so'/>
   <ComponentRef Id='shibauthorizer.exe'/>
   <ComponentRef Id='shibresponder.exe'/>
 
-  <ComponentRef Id='adfsD.so'/>
-  <ComponentRef Id='adfsliteD.so'/>
-  <ComponentRef Id='isapi_shibD.dll'/>
-  <ComponentRef Id='mod_shib_13D.so'/>
-  <ComponentRef Id='mod_shib_20D.so'/>
-  <ComponentRef Id='mod_shib_22D.so'/>
-  <ComponentRef Id='nsapi_shibD.dll'/>
-  <ComponentRef Id='odbcstoreD.so'/>
-  <ComponentRef Id='shibauthorizerD.exe'/>
-  <ComponentRef Id='shibresponderD.exe'/>
+  <ComponentRef Id='adfs.so_debug'/>
+  <ComponentRef Id='adfs_lite.so_debug'/>
+  <ComponentRef Id='isapi_shib.dll_debug'/>
+  <ComponentRef Id='mod_shib_13.so_debug'/>
+  <ComponentRef Id='mod_shib_20.so_debug'/>
+  <ComponentRef Id='mod_shib_22.so_debug'/>
+  <ComponentRef Id='mod_shib_24.so_debug'/>
+  <ComponentRef Id='nsapi_shib.dll_debug'/>
+  <ComponentRef Id='odbc_store.so_debug'/>
+  <ComponentRef Id='plugins.so_debug'/>
+  <ComponentRef Id='shibauthorizer.exe_debug'/>
+  <ComponentRef Id='shibresponder.exe_debug'/>
 
   <ComponentRef Id='shibd.exe'/>
-  <ComponentRef Id='shibdD.exe'/>
+  <ComponentRef Id='shibd.exe_debug'/>
 
   <!-- ShibbolethSP-registry-x32 -->
   <ComponentRef Id='file_extension'/>
diff --git a/msi/WiX/ShibbolethSP-exe-x64.wxs b/msi/WiX/ShibbolethSP-exe-x64.wxs
index 5726550..5b6903e 100644
--- a/msi/WiX/ShibbolethSP-exe-x64.wxs
+++ b/msi/WiX/ShibbolethSP-exe-x64.wxs
@@ -19,120 +19,97 @@
 <?include Versions.wxi ?>
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-  <!-- This is where we put all executables & so & dlls which make up the SP X86 installer
-       -->
+  <!-- This is where we put all executables & so & dlls which make up the SP X86 installer -->
   <Fragment>
     <!-- Configuration, licenses and documentation -->
     <DirectoryRef Id='INSTALLDIR'>
-      <Directory Id='bin64' Name='bin64' 
-                 FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\x64\Release' >
+      <Directory Id='bin64' Name='bin64' FileSource='$(var.SPBuildDirectory)\cpp-sp\x64\Release' >
         <Component Id='resolvertest64.exe' Guid='{C29672B6-971D-4828-BB51-1190C0877381}' Win64='yes'>
-          <File Id='resolvertest64.exe' Name='resolvertest.exe' KeyPath='yes' />
+          <File KeyPath='yes' Checksum='yes' Id='resolvertest64.exe' Name='resolvertest.exe' />
         </Component>
         <Component Id='mdquery64.exe' Guid='{3645630B-3991-4693-8664-A49242B9CF05}' Win64='yes'>
-          <File Id='mdquery64.exe' Name='mdquery.exe' KeyPath='yes' />
+          <File KeyPath='yes' Checksum='yes' Id='mdquery64.exe' Name='mdquery.exe' />
         </Component>
-        <Directory Id='bin64_debug' Name='debug' 
-                   FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\x64\Debug' >
+        <Directory Id='bin64_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\x64\Debug' >
           <Component Id='resolvertest64.exe_debug' Guid='{58C98426-8C96-41EE-B956-A6BBAEAE5A10}' Win64='yes'>
-            <File Id='resolvertest64.exe_debug' Name='resolvertest.exe' KeyPath='yes'/>
+            <File KeyPath='yes' Checksum='yes' Id='resolvertest64.exe_debug' Name='resolvertest.exe' />
           </Component>
           <Component Id='mdquery64.exe_debug' Guid='{2153EDFC-9962-4AF4-8071-40D0FF497BF9}' Win64='yes'>
-            <File Id='mdquery64.exe_debug' Name='mdquery.exe' KeyPath='yes' />
+            <File KeyPath='yes' Checksum='yes' Id='mdquery64.exe_debug' Name='mdquery.exe' />
           </Component>
         </Directory><!-- bin_debug -->
       </Directory><!-- bin -->
-
       <Directory Id='lib64' Name='lib64' >
-        <Directory Id='lib64_shibboleth' Name='shibboleth' 
-                   FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\x64\Release' >
+        <Directory Id='lib64_shibboleth' Name='shibboleth' FileSource='$(var.SPBuildDirectory)\cpp-sp\x64\Release' >
           <Component Id='adfs64.so' Guid='{2891ECDC-F507-4CEC-8A65-8B20FB93F4B7}' Win64='yes'>
-            <File Id='adfs64.so' Name='adfs.so' KeyPath='yes' />
+            <File KeyPath='yes' Checksum='yes' Id='adfs64.so' Name='adfs.so' />
           </Component>
           <Component Id='adfslite64.so' Guid='{1162CDA0-C3F8-4599-B01E-9EDAA73B2C0B}' Win64='yes'>
-            <File Id='adfslite64.so' Name='adfs-lite.so' KeyPath='yes' />
+            <File KeyPath='yes' Checksum='yes' Id='adfslite64.so' Name='adfs-lite.so' />
           </Component>
           <Component Id='isapi_shib64.dll' Guid='{3BC7260B-D035-4F79-A39E-EDA0181BBB1B}' Win64='yes'>
-            <File Id='isapi_shib64.dll' Name='isapi_shib.dll' KeyPath='yes' />
+            <File KeyPath='yes' Checksum='yes' Id='isapi_shib64.dll' Name='isapi_shib.dll' />
           </Component>
           <Component Id='mod_shib_2264.so' Guid='{3C8F67F5-C7C2-40DB-94AB-A26266C113C8}' Win64='yes'>
-            <File Id='mod_shib_2264.so' Name='mod_shib_22.so' KeyPath='yes' />
+            <File KeyPath='yes' Checksum='yes' Id='mod_shib_2264.so' Name='mod_shib_22.so' />
+          </Component>
+          <Component Id='mod_shib_2464.so' Guid='{6A7EDDE5-9593-4A8D-B767-E171856EEDD4}' Win64='yes'>
+            <File KeyPath='yes' Checksum='yes' Id='mod_shib_2464.so' Name='mod_shib_24.so' />
+          </Component>
+          <Component Id='odbc_store64.so' Guid='{D9CF6BD3-4BDB-4BC5-9EB3-6C68CA7544B6}' Win64='yes'>
+            <File KeyPath='yes' Checksum='yes' Id='odbc_store64.so' Name='odbc-store.so' />
           </Component>
-          <Component Id='odbcstore64.so' Guid='{D9CF6BD3-4BDB-4BC5-9EB3-6C68CA7544B6}' Win64='yes'>
-            <File Id='odbcstore64.so' Name='odbc-store.so' KeyPath='yes' />
+          <Component Id='plugins64.so' Guid='{C78105F1-1258-41A4-8505-5437E90FB1B4}' Win64='yes'>
+            <File KeyPath='yes' Checksum='yes' Id='plugins64.so' Name='plugins.so' />
           </Component>
           <Component Id='shibauthorizer64.exe' Guid='{5A323F4F-AE87-451A-9253-1965E46C9C5F}' Win64='yes'>
-            <File Id='shibauthorizer64.exe' Name='shibauthorizer.exe' KeyPath='yes' />
+            <File KeyPath='yes' Checksum='yes' Id='shibauthorizer64.exe' Name='shibauthorizer.exe' />
           </Component>
           <Component Id='shibresponder64.exe' Guid='{538D6EEC-1AE1-400B-94AF-2B7791BFEBDA}' Win64='yes'>
-            <File Id='shibresponder64.exe' Name='shibresponder.exe' KeyPath='yes' />
+            <File KeyPath='yes' Checksum='yes' Id='shibresponder64.exe' Name='shibresponder.exe' />
           </Component>
-          <Directory Id='lib64_shibboleth_debug' Name='debug' 
-                     FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\x64\Debug' >
-            <Component Id='adfsD64.so' Guid='{BFF58DDD-CF04-49B1-A172-C84087705D2A}' Win64='yes'>
-              <File Id='adfsD64.so' Name='adfs.so' KeyPath='yes' />
+          <Directory Id='lib64_shibboleth_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\x64\Debug' >
+            <Component Id='adfs64.so_debug' Guid='{BFF58DDD-CF04-49B1-A172-C84087705D2A}' Win64='yes'>
+              <File KeyPath='yes' Checksum='yes' Id='adfs64.so_debug' Name='adfs.so' />
+            </Component>
+            <Component Id='adfs_lite64.so_debug' Guid='{2A3D71BE-BF8F-4CBD-B890-B25F391B09FA}' Win64='yes'>
+              <File KeyPath='yes' Checksum='yes' Id='adfs_lite64.so_debug' Name='adfs-lite.so' />
+            </Component>
+            <Component Id='isapi_shib64.dll_debug' Guid='{60BC5679-A40E-42E5-9FC0-CCE924E660ED}' Win64='yes'>
+              <File KeyPath='yes' Checksum='yes' Id='isapi_shib64.dll_debug' Name='isapi_shib.dll' />
             </Component>
-            <Component Id='adfsliteD64.so' Guid='{2A3D71BE-BF8F-4CBD-B890-B25F391B09FA}' Win64='yes'>
-              <File Id='adfs_liteD64.so' Name='adfs-lite.so' KeyPath='yes' />
+            <Component Id='mod_shib_2264.so_debug' Guid='{59FE3C18-1920-48A0-80BC-7ECF8579E441}' Win64='yes'>
+              <File KeyPath='yes' Checksum='yes' Id='mod_shib_2264.so_debug' Name='mod_shib_22.so' />
             </Component>
-            <Component Id='isapi_shibD64.dll' Guid='{60BC5679-A40E-42E5-9FC0-CCE924E660ED}' Win64='yes'>
-              <File Id='isapi_shibD64.dll' Name='isapi_shib.dll' KeyPath='yes' />
+            <Component Id='mod_shib_2464.so_debug' Guid='{38EE87FE-EA2B-41B4-A457-38A8F84B9866}' Win64='yes'>
+              <File KeyPath='yes' Checksum='yes' Id='mod_shib_2464.so_debug' Name='mod_shib_24.so' />
             </Component>
-            <Component Id='mod_shib_22D64.so' Guid='{59FE3C18-1920-48A0-80BC-7ECF8579E441}' Win64='yes'>
-              <File Id='mod_shib_22D64.so' Name='mod_shib_22.so' KeyPath='yes' />
+            <Component Id='odbc_store64.so_debug' Guid='{586CE55A-F089-4541-96D5-5EE26F8FC471}' Win64='yes'>
+              <File KeyPath='yes' Checksum='yes' Id='odbc_store64.so_debug' Name='odbc-store.so' />
             </Component>
-            <Component Id='odbcstoreD64.so' Guid='{586CE55A-F089-4541-96D5-5EE26F8FC471}' Win64='yes'>
-              <File Id='odbc_storeD64.so' Name='odbc-store.so' KeyPath='yes' />
+            <Component Id='plugins64.so_debug' Guid='{E6E051C8-6C84-4CC9-B718-365E627068B6}' Win64='yes'>
+              <File KeyPath='yes' Checksum='yes' Id='plugins64.so_debug' Name='plugins.so' />
             </Component>
-            <Component Id='shibauthorizerD64.exe' Guid='{642C9137-66C8-4E2E-A76C-4D9F65B17157}' Win64='yes'>
-              <File Id='shibauthorizer64.exe_Debug' Name='shibauthorizer.exe' KeyPath='yes' />
+            <Component Id='shibauthorizer64.exe_debug' Guid='{642C9137-66C8-4E2E-A76C-4D9F65B17157}' Win64='yes'>
+              <File KeyPath='yes' Checksum='yes' Id='shibauthorizer64.exe_debug' Name='shibauthorizer.exe' />
             </Component>
-            <Component Id='shibresponderD64.exe' Guid='{7947F31A-1429-44FC-85B2-BF1E7AA50D20}' Win64='yes'>
-              <File Id='shibresponder64.exe_Debug' Name='shibresponder.exe' KeyPath='yes' />
+            <Component Id='shibresponder64.exe_debug' Guid='{7947F31A-1429-44FC-85B2-BF1E7AA50D20}' Win64='yes'>
+              <File KeyPath='yes' Checksum='yes' Id='shibresponder64.exe_debug' Name='shibresponder.exe' />
             </Component>
           </Directory><!-- lib_shibboleth_debug -->
         </Directory><!-- lib_shibboleth -->
       </Directory><!-- lib -->
       <!-- the service bin -->
-      <Directory Id='sbin64' Name='sbin64'
-                 FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\x64\Release' >
+      <Directory Id='sbin64' Name='sbin64' FileSource='$(var.SPBuildDirectory)\cpp-sp\x64\Release' >
         <Component Id='shibd64.exe' Guid='{707B57A2-CCA0-48A6-9F66-275EB04474AA}' Win64='yes'>
-          <File Id='shibd64.exe' Name='shibd.exe' KeyPath='yes' />
+          <File KeyPath='yes' Checksum='yes' Id='shibd64.exe' Name='shibd.exe' />
         </Component>
-        <Directory Id='sbin64_debug' Name='debug'
-                   FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\x64\Debug' >
-          <Component Id='shibdD64.exe' Guid='{657A1902-0104-47C7-84A7-AEB5F736B02F}' Win64='yes'>
-            <File Id='shibd64.exe_debug' Name='shibd.exe' KeyPath='yes' />
+        <Directory Id='sbin64_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\x64\Debug' >
+          <Component Id='shibd64.exe_debug' Guid='{657A1902-0104-47C7-84A7-AEB5F736B02F}' Win64='yes'>
+            <File KeyPath='yes' Checksum='yes' Id='shibd64.exe_debug' Name='shibd.exe' />
           </Component>
         </Directory><!-- sbin_debug -->
       </Directory><!-- sbin -->
     </DirectoryRef><!-- INSTALLDIR -->
-
-    <!-- Components
-         <ComponentRef Id='resolvertest64.exe'/>
-         <ComponentRef Id='mdquery64.exe'/>
-         <ComponentRed Id='resolvertest64.exe_debug'/>
-         <ComponentRef Id='mdquery64.exe_debug' />
-
-         <ComponentRef Id='adfs64.so'/>
-         <ComponentRef Id='adfslite64.so'/>
-         <ComponentRef Id='isapi_shib64.dll'/>
-         <ComponentRef Id='mod_shib_2264.so'/>
-         <ComponentRef Id='odbcstore64.so'/>
-         <ComponentRef Id='shibauthorizer64.exe'/>
-         <ComponentRef Id='shibresponder64.exe'/>
-
-         <ComponentRef Id='adfsD64.so'/>
-         <ComponentRef Id='adfsliteD64.so'/>
-         <ComponentRef Id='isapi_shibD64.dll'/>
-         <ComponentRef Id='mod_shib_22D64.so'/>
-         <ComponentRef Id='odbcstoreD64.so'/>
-         <ComponentRef Id='shibauthorizerD64.exe'/>
-         <ComponentRef Id='shibresponderD64.exe'/>
-
-         <ComponentRef Id='shibd64.exe'/>
-         <ComponentRef Id='shibdD64.exe'/>
-         -->
-
   </Fragment>
 </Wix>
diff --git a/msi/WiX/ShibbolethSP-exe-x86.wxs b/msi/WiX/ShibbolethSP-exe-x86.wxs
index e8834ee..85e8326 100644
--- a/msi/WiX/ShibbolethSP-exe-x86.wxs
+++ b/msi/WiX/ShibbolethSP-exe-x86.wxs
@@ -19,103 +19,108 @@
 <?include Versions.wxi ?>
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-  <!-- This is where we put all executables & so & dlls which make up the SP X86 installer
-       -->
+  <!-- This is where we put all executables & so & dlls which make up the SP X86 installer -->
   <Fragment>
     <!-- Configuration, licenses and documentation -->
     <DirectoryRef Id='INSTALLDIR'>
-      <Directory Id='bin' Name='bin' 
-                 FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Release' >
+      <Directory Id='bin' Name='bin' FileSource='$(var.SPBuildDirectory)\cpp-sp\Release' >
         <Component Id='resolvertest.exe' Guid='{D381B6FA-2971-457B-804E-F08DD517866F}'>
-          <File Name='resolvertest.exe' KeyPath='yes' />
+          <File KeyPath='yes' Checksum='yes' Name='resolvertest.exe' />
         </Component>
         <Component Id='mdquery.exe' Guid='{5F322597-3B26-48E5-95BA-CF991CF6D6DB}'>
-          <File Name='mdquery.exe' KeyPath='yes' />
+          <File KeyPath='yes' Checksum='yes' Name='mdquery.exe' />
         </Component>
-        <Directory Id='bin_debug' Name='debug' 
-                   FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Debug' >
+        <Directory Id='bin_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\Debug' >
           <Component Id='resolvertest.exe_debug' Guid='{4FA03A33-961A-42E5-8D7A-5F2E207757DD}'>
-            <File Name='resolvertest.exe' Id='resolvertest.exe_debug' KeyPath='yes'/>
+            <File KeyPath='yes' Checksum='yes' Id='resolvertest.exe_debug' Name='resolvertest.exe' />
           </Component>
           <Component Id='mdquery.exe_debug' Guid='{C7A4A6A5-3DAF-4254-9C29-1511AB3ABC62}'>
-            <File Name='mdquery.exe' Id='mdquery.exe_debug' KeyPath='yes' />
+            <File KeyPath='yes' Checksum='yes' Id='mdquery.exe_debug' Name='mdquery.exe' />
           </Component>
         </Directory><!-- bin_debug -->
       </Directory><!-- bin -->
-
       <Directory Id='lib' Name='lib' >
-        <Directory Id='lib_shibboleth' Name='shibboleth' 
-                   FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Release' >
+        <Directory Id='lib_shibboleth' Name='shibboleth' FileSource='$(var.SPBuildDirectory)\cpp-sp\Release' >
           <Component Id='adfs.so' Guid='{9C92C803-E905-4B43-8723-05678DC73B88}'>
-            <File Name='adfs.so' KeyPath='yes' />
+            <File KeyPath='yes' Checksum='yes' Name='adfs.so' />
           </Component>
-          <Component Id='adfslite.so' Guid='{EDFA1AD0-1D4A-4D51-B2F0-6C779059FA78}'>
-            <File Name='adfs-lite.so' KeyPath='yes' />
+          <Component Id='adfs_lite.so' Guid='{EDFA1AD0-1D4A-4D51-B2F0-6C779059FA78}'>
+            <File KeyPath='yes' Checksum='yes' Name='adfs-lite.so' />
           </Component>
           <Component Id='isapi_shib.dll' Guid='{716D6F4F-4185-4219-B1BA-1D15F867926E}'>
-            <File Name='isapi_shib.dll' KeyPath='yes' />
+            <File KeyPath='yes' Checksum='yes' Name='isapi_shib.dll' />
           </Component>
           <Component Id='mod_shib_13.so' Guid='{5C85940B-7644-4AA4-9948-9EFFC1729EFB}'>
-            <File Name='mod_shib_13.so' KeyPath='yes' />
+            <File KeyPath='yes' Checksum='yes' Name='mod_shib_13.so' />
           </Component>
           <Component Id='mod_shib_20.so' Guid='{FFC2D560-FD06-42BB-9EA7-B0CC988AC4A6}'>
-            <File Name='mod_shib_20.so' KeyPath='yes' />
+            <File KeyPath='yes' Checksum='yes' Name='mod_shib_20.so' />
           </Component>
           <Component Id='mod_shib_22.so' Guid='{BB889066-3EF2-43C5-BC4D-CD6B1DC4AE7B}'>
-            <File Name='mod_shib_22.so' KeyPath='yes' />
+            <File KeyPath='yes' Checksum='yes' Name='mod_shib_22.so' />
+          </Component>
+          <Component Id='mod_shib_24.so' Guid='{8CAE4DF0-C8A8-4A48-A213-F4B3AFE6F439}'>
+            <File KeyPath='yes' Checksum='yes' Name='mod_shib_24.so' />
           </Component>
           <Component Id='nsapi_shib.dll' Guid='{F199DD8A-292F-4C7D-AACB-7283852D6335}'>
-            <File Name='nsapi_shib.dll' KeyPath='yes' />
+            <File KeyPath='yes' Checksum='yes' Name='nsapi_shib.dll' />
+          </Component>
+          <Component Id='odbc_store.so' Guid='{807FBD34-6E59-4BFD-975D-AD7B381F2A7E}'>
+            <File KeyPath='yes' Checksum='yes' Name='odbc-store.so' />
           </Component>
-          <Component Id='odbcstore.so' Guid='{807FBD34-6E59-4BFD-975D-AD7B381F2A7E}'>
-            <File Name='odbc-store.so' KeyPath='yes' />
+          <Component Id='plugins.so' Guid='{F738E29B-903B-4C86-BE27-4C72EC69915E}'>
+            <File KeyPath='yes' Checksum='yes' Name='plugins.so' />
           </Component>
           <Component Id='shibauthorizer.exe' Guid='{7C7C1C24-902A-4003-AE59-599E79161782}'>
-            <File Name='shibauthorizer.exe' KeyPath='yes' />
+            <File KeyPath='yes' Checksum='yes' Name='shibauthorizer.exe' />
           </Component>
           <Component Id='shibresponder.exe' Guid='{510267D9-61F2-47EF-99D2-CB3D21CB14EB}'>
-            <File Name='shibresponder.exe' KeyPath='yes' />
+            <File KeyPath='yes' Checksum='yes' Name='shibresponder.exe' />
           </Component>
-          <Directory Id='lib_shibboleth_debug' Name='debug' 
-                     FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Debug' >
-            <Component Id='adfsD.so' Guid='{9B8E071F-B251-4373-A786-8966FD0D22EF}'>
-              <File Id='adfsD.so' Name='adfs.so' KeyPath='yes' />
+          <Directory Id='lib_shibboleth_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\Debug' >
+            <Component Id='adfs.so_debug' Guid='{9B8E071F-B251-4373-A786-8966FD0D22EF}'>
+              <File KeyPath='yes' Checksum='yes' Id='adfs.so_debug' Name='adfs.so' />
             </Component>
-            <Component Id='adfsliteD.so' Guid='{680F510A-FFDA-4AE2-8C5D-DD9D62C90DDC}'>
-              <File Id='adfs_liteD.so' Name='adfs-lite.so' KeyPath='yes' />
+            <Component Id='adfs_lite.so_debug' Guid='{680F510A-FFDA-4AE2-8C5D-DD9D62C90DDC}'>
+              <File KeyPath='yes' Checksum='yes' Id='adfs_lite.so_debug' Name='adfs-lite.so' />
             </Component>
-            <Component Id='isapi_shibD.dll' Guid='{F8212D30-0BA8-4F02-B595-E8E5D312342B}'>
-              <File Id='isapi_shibD.dll' Name='isapi_shib.dll' KeyPath='yes' />
+            <Component Id='isapi_shib.dll_debug' Guid='{F8212D30-0BA8-4F02-B595-E8E5D312342B}'>
+              <File KeyPath='yes' Checksum='yes' Id='isapi_shib.dll_debug' Name='isapi_shib.dll' />
             </Component>
-            <Component Id='mod_shib_13D.so' Guid='{E8B798AB-D772-428D-8033-2A77CB437CF0}'>
-              <File Id='mod_shib_13D.so' Name='mod_shib_13.so' KeyPath='yes' />
+            <Component Id='mod_shib_13.so_debug' Guid='{E8B798AB-D772-428D-8033-2A77CB437CF0}'>
+              <File KeyPath='yes' Checksum='yes' Id='mod_shib_13.so_debug' Name='mod_shib_13.so' />
             </Component>
-            <Component Id='mod_shib_20D.so' Guid='{468806BF-6924-47D5-B319-608C2D63FDDC}'>
-              <File Id='mod_shib_20D.so' Name='mod_shib_20.so' KeyPath='yes' />
+            <Component Id='mod_shib_20.so_debug' Guid='{468806BF-6924-47D5-B319-608C2D63FDDC}'>
+              <File KeyPath='yes' Checksum='yes' Id='mod_shib_20.so_debug' Name='mod_shib_20.so' />
             </Component>
-            <Component Id='mod_shib_22D.so' Guid='{3DA4492F-C0EA-4286-9C37-13F82342FA67}'>
-              <File Id='mod_shib_22D.so' Name='mod_shib_22.so' KeyPath='yes' />
+            <Component Id='mod_shib_22.so_debug' Guid='{3DA4492F-C0EA-4286-9C37-13F82342FA67}'>
+              <File KeyPath='yes' Checksum='yes' Id='mod_shib_22.so_debug' Name='mod_shib_22.so' />
             </Component>
-            <Component Id='nsapi_shibD.dll' Guid='{492A5D72-4FE0-417E-9023-311E1BF34816}'>
-              <File Id='nsapi_shibD.dll' Name='nsapi_shib.dll' KeyPath='yes' />
+            <Component Id='mod_shib_24.so_debug' Guid='{E04003DF-8C61-4C9E-87AB-89223C5E65DC}'>
+              <File KeyPath='yes' Checksum='yes' Id='mod_shib_24.so_debug' Name='mod_shib_24.so'/>
             </Component>
-            <Component Id='odbcstoreD.so' Guid='{F217D7CF-91C1-4318-901D-709C710803C6}'>
-              <File Id='odbc_storeD.so' Name='odbc-store.so' KeyPath='yes' />
+            <Component Id='nsapi_shib.dll_debug' Guid='{492A5D72-4FE0-417E-9023-311E1BF34816}'>
+              <File KeyPath='yes' Checksum='yes' Id='nsapi_shib.dll_debug' Name='nsapi_shib.dll' />
             </Component>
-            <Component Id='shibauthorizerD.exe' Guid='{83360639-DDC0-4B76-8168-21FB77EE6CD6}'>
-              <File Id='shibauthorizer.exe_Debug' Name='shibauthorizer.exe' KeyPath='yes' />
+            <Component Id='odbc_store.so_debug' Guid='{F217D7CF-91C1-4318-901D-709C710803C6}'>
+              <File KeyPath='yes' Checksum='yes' Id='odbc_store.so_debug' Name='odbc-store.so' />
             </Component>
-            <Component Id='shibresponderD.exe' Guid='{760124EA-67E5-4393-B3DF-657DCC92F04C}'>
-              <File Id='shibresponder.exe_Debug' Name='shibresponder.exe' KeyPath='yes' />
+            <Component Id='plugins.so_debug' Guid='{6D3F2ABC-EFD4-4BF7-889D-3FD0DBE3727C}'>
+              <File KeyPath='yes' Checksum='yes' Id='plugins.so_debug' Name='plugins.so' />
+            </Component>
+            <Component Id='shibauthorizer.exe_debug' Guid='{83360639-DDC0-4B76-8168-21FB77EE6CD6}'>
+              <File KeyPath='yes' Checksum='yes' Id='shibauthorizer.exe_debug' Name='shibauthorizer.exe' />
+            </Component>
+            <Component Id='shibresponder.exe_debug' Guid='{760124EA-67E5-4393-B3DF-657DCC92F04C}'>
+              <File KeyPath='yes' Checksum='yes' Id='shibresponder.exe_debug' Name='shibresponder.exe' />
             </Component>
           </Directory><!-- lib_shibboleth_debug -->
         </Directory><!-- lib_shibboleth -->
       </Directory><!-- lib -->
       <!-- the service bin -->
-      <Directory Id='sbin' Name='sbin'
-                 FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Release' >
+      <Directory Id='sbin' Name='sbin' FileSource='$(var.SPBuildDirectory)\cpp-sp\Release' >
         <Component Id='shibd.exe' Guid='{2476BB80-9384-4026-86F5-E1569A685187}'>
-          <File Name='shibd.exe' KeyPath='yes' />
+          <File KeyPath='yes' Checksum='yes' Name='shibd.exe' />
           <!-- NOTE - whether this actually happens is predicated in noarch on whether this is an upgrade or not -->
           <ServiceInstall Id='shibd' Name='shibd_Default' 
                           DisplayName='Shibboleth 2 Daemon (Default)' Type='ownProcess' 
@@ -123,47 +128,12 @@
           <ServiceControl Id='shibd_Default' Name='shibd_Default' Stop='uninstall'  
                           Remove='uninstall' Start='install' Wait='yes' />
         </Component>
-        <Directory Id='sbin_debug' Name='debug'
-                   FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Debug' >
-          <Component Id='shibdD.exe' Guid='{91E9DF13-0940-43E7-9A2F-9571F6FC3DF2}'>
-            <File Id='shibd.exe_debug' Name='shibd.exe' KeyPath='yes' />
+        <Directory Id='sbin_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\Debug' >
+          <Component Id='shibd.exe_debug' Guid='{91E9DF13-0940-43E7-9A2F-9571F6FC3DF2}'>
+            <File KeyPath='yes' Checksum='yes' Id='shibd.exe_debug' Name='shibd.exe' />
           </Component>
         </Directory><!-- sbin_debug -->
       </Directory><!-- sbin -->
     </DirectoryRef><!-- INSTALLDIR -->
-
-    <!-- Components
-
-         <ComponentRef Id='resolvertest.exe'/>
-         <ComponentRef Id='mdquery.exe'/>
-         <ComponentRef Id='resolvertest.exe_debug'/>
-         <ComponentRef Id='mdquery.exe_debug'/>
-
-         <ComponentRef Id='adfs.so'/>
-         <ComponentRef Id='adfslite.so'/>
-         <ComponentRef Id='isapi_shib.dll'/>
-         <ComponentRef Id='mod_shib_13.so'/>
-         <ComponentRef Id='mod_shib_20.so'/>
-         <ComponentRef Id='mod_shib_22.so'/>
-         <ComponentRef Id='nsapi_shib.dll'/>
-         <ComponentRef Id='odbcstore.so'/>
-         <ComponentRef Id='shibauthorizer.exe'/>
-         <ComponentRef Id='shibresponder.exe'/>
-
-         <ComponentRef Id='adfsD.so'/>
-         <ComponentRef Id='adfsliteD.so'/>
-         <ComponentRef Id='isapi_shibD.dll'/>
-         <ComponentRef Id='mod_shib_13D.so'/>
-         <ComponentRef Id='mod_shib_20D.so'/>
-         <ComponentRef Id='mod_shib_22D.so'/>
-         <ComponentRef Id='nsapi_shibD.dll'/>
-         <ComponentRef Id='odbcstoreD.so'/>
-         <ComponentRef Id='shibauthorizerD.exe'/>
-         <ComponentRef Id='shibresponderD.exe'/>
-
-         <ComponentRef Id='shibd.exe'/>
-         <ComponentRef Id='shibdD.exe'/>
-         -->
-
   </Fragment>
 </Wix>
diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs
index 7377aaf..78084e2 100644
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -37,7 +37,6 @@
 
     <Media Id='1' Cabinet='product.cab' EmbedCab='yes' />
 
-
     <?include ShibbolethSP-properties.wxi?>
 
     <!-- NOTE we should not use sys.BUILDARCH since that reflects the candle parameters, *NOT* the architecture -->
@@ -57,6 +56,8 @@
         <Merge Id='CurlMergeModule_x86' Language='1033' SourceFile='MergeModules\Curl-x86.msm' DiskId='1' />
         <Merge Id='FastCGIMergeModule_x86' Language='1033' SourceFile='MergeModules\FastCGI-x86.msm' DiskId='1' />
         <Merge Id='Log4ShibMergeModule_x86' Language='1033' SourceFile='MergeModules\Log4Shib-x86.msm' DiskId='1' />
+        <Merge Id='OpenSAMLMergeModule_x86' Language='1033' SourceFile='MergeModules\OpenSAML-x86.msm' DiskId='1' />
+        <Merge Id='OpenSAMLMergeModule_schemas' Language='1033' SourceFile='MergeModules\OpenSAML-schemas.msm' DiskId='1' />
         <Merge Id='OpenSSLMergeModule_x86' Language='1033' SourceFile='MergeModules\OpenSSL-x86.msm' DiskId='1' />
         <Merge Id='ShibbolethMergeModule_x86' Language='1033' SourceFile='MergeModules\Shibboleth-x86.msm' DiskId='1' />
         <Merge Id='ShibbolethMergeModule_schemas' Language='1033' SourceFile='MergeModules\Shibboleth-schemas.msm' DiskId='1' />
@@ -75,6 +76,7 @@
         <Merge Id='CurlMergeModule_x64' Language='1033' SourceFile='MergeModules\Curl-x64.msm' DiskId='1' />
         <Merge Id='FastCGIMergeModule_x64' Language='1033' SourceFile='MergeModules\FastCGI-x64.msm' DiskId='1' />
         <Merge Id='Log4ShibMergeModule_x64' Language='1033' SourceFile='MergeModules\Log4Shib-x64.msm' DiskId='1' />
+        <Merge Id='OpenSAMLMergeModule_x64' Language='1033' SourceFile='MergeModules\OpenSAML-x64.msm' DiskId='1' />
         <Merge Id='OpenSSLMergeModule_x64' Language='1033' SourceFile='MergeModules\OpenSSL-x64.msm' DiskId='1' />
         <Merge Id='ShibbolethMergeModule_x64' Language='1033' SourceFile='MergeModules\Shibboleth-x64.msm' DiskId='1' />
         <Merge Id='XercesMergeModule_x64' Language='1033' SourceFile='MergeModules\Xerces-x64.msm' DiskId='1' />
@@ -96,10 +98,9 @@
         <Environment Id='SetPath' Name='PATH' Action='set' Part='last'  System='yes'
                      Value='[ProgramFilesFolder]Shibboleth\SP\lib' />
       </Component>
-
     </Directory><!--TARGETDIR-->
 
-    <DirectoryRef Id='etc_shibboleth' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\configs'>
+    <DirectoryRef Id='etc_shibboleth' FileSource='$(var.SPBuildDirectory)\cpp-sp\configs'>
       <Component Id='SetService64' Guid='{8DE75314-84B5-4BD1-ABD2-9FC1DEE399DC}' Permanent='yes'>
         <File KeyPath='yes' Name='SetService64.bat' />
       </Component>
@@ -108,11 +109,12 @@
       </Component>
     </DirectoryRef><!-- etc_shibboleth -->
 
-    <Feature Id='Shibboleth' Title='Shibboleth' Level='1' Display='hidden' 
-             ConfigurableDirectory='INSTALLDIR'>
+    <Feature Id='Shibboleth' Title='Shibboleth' Level='1' Display='hidden' ConfigurableDirectory='INSTALLDIR'>
       <MergeRef Id='CurlMergeModule_x86'/>
       <MergeRef Id='FastCGIMergeModule_x86'/>
       <MergeRef Id='Log4ShibMergeModule_x86'/>
+      <MergeRef Id='OpenSAMLMergeModule_x86'/>
+      <MergeRef Id='OpenSAMLMergeModule_schemas'/>
       <MergeRef Id='OpenSSLMergeModule_x86'/>
       <MergeRef Id='ShibbolethMergeModule_x86'/>
       <MergeRef Id='ShibbolethMergeModule_schemas'/>
@@ -126,6 +128,7 @@
       <MergeRef Id='CurlMergeModule_x64'/>
       <MergeRef Id='FastCGIMergeModule_x64'/>
       <MergeRef Id='Log4ShibMergeModule_x64'/>
+      <MergeRef Id='OpenSAMLMergeModule_x64'/>
       <MergeRef Id='OpenSSLMergeModule_x64'/>
       <MergeRef Id='ShibbolethMergeModule_x64'/>
       <MergeRef Id='XercesMergeModule_x64'/>
@@ -143,23 +146,27 @@
       <ComponentRef Id='mdquery64.exe_debug' />
 
       <ComponentRef Id='adfs64.so'/>
-      <ComponentRef Id='adfslite64.so'/>
+      <ComponentRef Id='adfs_lite64.so'/>
       <ComponentRef Id='isapi_shib64.dll'/>
       <ComponentRef Id='mod_shib_2264.so'/>
-      <ComponentRef Id='odbcstore64.so'/>
+      <ComponentRef Id='mod_shib_2464.so'/>
+      <ComponentRef Id='odbc_store64.so'/>
+      <ComponentRef Id='plugins64.so'/>
       <ComponentRef Id='shibauthorizer64.exe'/>
       <ComponentRef Id='shibresponder64.exe'/>
 
-      <ComponentRef Id='adfsD64.so'/>
-      <ComponentRef Id='adfsliteD64.so'/>
-      <ComponentRef Id='isapi_shibD64.dll'/>
-      <ComponentRef Id='mod_shib_22D64.so'/>
-      <ComponentRef Id='odbcstoreD64.so'/>
-      <ComponentRef Id='shibauthorizerD64.exe'/>
-      <ComponentRef Id='shibresponderD64.exe'/>
+      <ComponentRef Id='adfs64.so_debug'/>
+      <ComponentRef Id='adfs_lite64.so_debug'/>
+      <ComponentRef Id='isapi_shib64.dll_debug'/>
+      <ComponentRef Id='mod_shib_2264.so_debug'/>
+      <ComponentRef Id='mod_shib_2464.so_debug'/>
+      <ComponentRef Id='odbc_store64.so_debug'/>
+      <ComponentRef Id='plugins64.so_debug'/>
+      <ComponentRef Id='shibauthorizer64.exe_debug'/>
+      <ComponentRef Id='shibresponder64.exe_debug'/>
 
       <ComponentRef Id='shibd64.exe'/>
-      <ComponentRef Id='shibdD64.exe'/>
+      <ComponentRef Id='shibd64.exe_debug'/>
 
       <!-- ShibbolethSP-registry-x64 -->
 
diff --git a/msi/WiX/ShibbolethSP-main-x86.wxs b/msi/WiX/ShibbolethSP-main-x86.wxs
index 280b010..71e336a 100644
--- a/msi/WiX/ShibbolethSP-main-x86.wxs
+++ b/msi/WiX/ShibbolethSP-main-x86.wxs
@@ -22,7 +22,7 @@
   <Product Id='{EA2259A7-D844-475A-B473-CCE3EEA209D9}' Language='1033' 
            Manufacturer='Shibboleth Consortium' Name='Shibboleth $(var.ShibbolethVersion)' 
            UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion)'>
-    <Package Description='Installer for Shibboleth SP (x86 and x64)' Compressed='yes'
+    <Package Description='Installer for Shibboleth SP (32-bit only)' Compressed='yes'
              Manufacturer='Shibboleth Consortium' InstallerVersion='300'/>
 
     <MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." 
@@ -34,7 +34,7 @@
     <Condition Message='Shibboleth requires a Windows NT-based operating system.'>NOT Version9X</Condition>
     <Condition Message='You must uninstall recent versions of Shibboleth before using this installer. To uninstall, use the &quot;Change&quot; option from the Add/Remove dialog and then Remove. Attempting to uninstall directly causes the installer to hang on most systems.'>SHIB_OLDVERSION = "none"</Condition>
 
-    <Condition Message='For a 32 installation on a 64 architecture, install the 64bit msi but specify a 32 bit shibd'>NOT VersionNT64</Condition>
+    <Condition Message='For a 32 installation on a 64 architecture, install the 64-bit MSI but specify the 32-bit Service'>NOT VersionNT64</Condition>
 
     <Media Id='1' Cabinet='product.cab' EmbedCab='yes' />
 
@@ -56,6 +56,8 @@
         <Merge Id='CurlMergeModule_x86' Language='1033' SourceFile='MergeModules\Curl-x86.msm' DiskId='1' />
         <Merge Id='FastCGIMergeModule_x86' Language='1033' SourceFile='MergeModules\FastCGI-x86.msm' DiskId='1' />
         <Merge Id='Log4ShibMergeModule_x86' Language='1033' SourceFile='MergeModules\Log4Shib-x86.msm' DiskId='1' />
+        <Merge Id='OpenSAMLMergeModule_x86' Language='1033' SourceFile='MergeModules\OpenSAML-x86.msm' DiskId='1' />
+        <Merge Id='OpenSAMLMergeModule_schemas' Language='1033' SourceFile='MergeModules\OpenSAML-schemas.msm' DiskId='1' />
         <Merge Id='OpenSSLMergeModule_x86' Language='1033' SourceFile='MergeModules\OpenSSL-x86.msm' DiskId='1' />
         <Merge Id='ShibbolethMergeModule_x86' Language='1033' SourceFile='MergeModules\Shibboleth-x86.msm' DiskId='1' />
         <Merge Id='ShibbolethMergeModule_schemas' Language='1033' SourceFile='MergeModules\Shibboleth-schemas.msm' DiskId='1' />
@@ -80,6 +82,8 @@
       <MergeRef Id='CurlMergeModule_x86'/>
       <MergeRef Id='FastCGIMergeModule_x86'/>
       <MergeRef Id='Log4ShibMergeModule_x86'/>
+      <MergeRef Id='OpenSAMLMergeModule_x86'/>
+      <MergeRef Id='OpenSAMLMergeModule_schemas'/>
       <MergeRef Id='OpenSSLMergeModule_x86'/>
       <MergeRef Id='ShibbolethMergeModule_x86'/>
       <MergeRef Id='ShibbolethMergeModule_schemas'/>
diff --git a/msi/WiX/ShibbolethSP-noarch.wxs b/msi/WiX/ShibbolethSP-noarch.wxs
index 3f20e94..31a32ed 100644
--- a/msi/WiX/ShibbolethSP-noarch.wxs
+++ b/msi/WiX/ShibbolethSP-noarch.wxs
@@ -18,135 +18,142 @@
 <?include Versions.wxi ?>
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-  <!-- This is where we put all the architecture neutral bits of the
-       Shibboleth install.  It turns out that it may not be all the
-       architecture insenstive stuff since some GUIDS may have moved
-    -->
+  <!--
+    This is where we put all the architecture neutral bits of the
+    Shibboleth install.  It turns out that it may not be all the
+    architecture insenstive stuff since some GUIDS may have moved
+  -->
   <Fragment>
     <!-- Files First -->
     <!-- Configuration, licenses and documentation -->
 
     <DirectoryRef Id='INSTALLDIR'>
       <Directory Id='doc' Name='doc' >
-        <Directory Id='doc_shibboleth' Name='shibboleth' 
-                   FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc' >
+        <Directory Id='doc_shibboleth' Name='shibboleth' FileSource='$(var.SPBuildDirectory)\cpp-sp\doc' >
           <Component Id='main.css' Guid='{EA1366EE-0FD1-42E7-9F3F-C19E6C0D12D6}'>
-            <File Name='main.css' KeyPath='yes'/>
+            <File KeyPath='yes' Name='main.css' />
           </Component>
           <Component Id='logo.jpg' Guid='{7F05E91A-A390-4A72-B4DC-1A4FE950B30A}'>
-            <File Name='logo.jpg' />
+            <File KeyPath='yes' Name='logo.jpg' />
           </Component>
           <Component Id='CREDITS.txt' Guid='{9A792E0C-61F1-4D08-9672-BE82FFB6B7F1}'>
-            <File Name='CREDITS.txt' />
+            <File KeyPath='yes' Name='CREDITS.txt' />
           </Component>
           <Component Id='LICENSE.txt' Guid='{404E7A3C-22C2-4A02-8DC0-7D5C0B25DED1}'>
-            <File Name='LICENSE.txt' />
+            <File KeyPath='yes' Name='LICENSE.txt' />
           </Component>
           <Component Id='NOTICE.txt' Guid='{80619251-6754-480A-AFAA-D7398482053C}'>
-            <File Name='NOTICE.txt' />
+            <File KeyPath='yes' Name='NOTICE.txt' />
           </Component>
           <Component Id='README.txt' Guid='{2E5A28EE-B70B-402B-8E6F-72E8EC1EEF0D}'>
-            <File Name='README.txt'/>
+            <File KeyPath='yes' Name='README.txt'/>
           </Component>
           <Component Id='RELEASE.txt' Guid='{5822AF4E-BE53-4952-B662-6BE2D3913D31}'>
-            <File Name='RELEASE.txt' />
+            <File KeyPath='yes' Name='RELEASE.txt' />
           </Component>
         </Directory><!-- doc_shibboleth -->
       </Directory><!-- doc -->
       <Directory Id='etc' Name='etc' >
-        <Directory Id='etc_shibboleth' Name='shibboleth' 
-                   FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\configs' >
+        <Directory Id='etc_shibboleth' Name='shibboleth' FileSource='$(var.SPBuildDirectory)\cpp-sp\configs' >
           <Component Id='openssl.cnf' Guid='{1F1B9F9B-6437-46F1-ACE8-8D135612336C}' Permanent='yes'>
-            <File KeyPath='yes' 
-                  Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\apps\openssl.cnf' />
+            <File KeyPath='yes' Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\apps\openssl.cnf' />
           </Component>
           <Component Id='upgrade.xsl' Guid='{D8D1270C-2F85-4465-8EC0-F5F30A2B3EDD}' Permanent='yes'>
-            <File Name='upgrade.xsl' />
+            <File KeyPath='yes' Name='upgrade.xsl' />
           </Component>
-          <Component Id='examplemetadata.xml' Guid='{D9852008-249D-405D-8059-5DAD307D2723}' 
-                     Permanent='yes'>
-            <File Name='example-metadata.xml' />
+          <Component Id='example_metadata.xml' Guid='{D9852008-249D-405D-8059-5DAD307D2723}' Permanent='yes'>
+            <File KeyPath='yes' Name='example-metadata.xml' />
           </Component>
-          <Component Id='exampleshibboleth2.xml' Guid='{85415A41-2B4E-406F-9CFC-63CFC360A9C7}' 
-                     Permanent='yes'>
-            <File Name='example-shibboleth2.xml' />
+          <Component Id='example_shibboleth2.xml' Guid='{85415A41-2B4E-406F-9CFC-63CFC360A9C7}' Permanent='yes'>
+            <File KeyPath='yes' Name='example-shibboleth2.xml' />
           </Component>
           <Component Id='keygen.bat' Guid='{A5BBCB8B-42B3-4402-B66D-66D2971F509F}'  Permanent='yes'>
-            <File Name='keygen.bat' KeyPath='yes' Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\configs\keygen.bat-wix'/>
+            <File KeyPath='yes' Name='keygen.bat' Source='$(var.SPBuildDirectory)\cpp-sp\configs\keygen.bat-wix'/>
           </Component>
           <Component Id='xsltproc.js' Guid='{B87F4A53-3C37-45DA-BE6F-C46790FA7C2D}'  Permanent='yes'>
-            <File Name='xsltproc.js' />
+            <File KeyPath='yes' Name='xsltproc.js' />
           </Component>
-          <Directory Id='etc_shibboleth_dist' Name='dist' 
-                     FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\configs' >
-            <Component Id='dist_noperm' Guid='{6AEBA525-8F52-4D14-BAEE-0292A2E214D1}'>
-
-              <File Name='apache22.config.in' KeyPath='yes' />
+          <Directory Id='etc_shibboleth_dist' Name='dist' FileSource='$(var.SPBuildDirectory)\cpp-sp\configs' >
+            <Component Id='apache.config.in' Guid='{AF4EB2B1-2489-4E39-A89E-1CA7AC2B7483}'>
+              <File KeyPath='yes' Name='apache.config.in' />
+            </Component>
+            <Component Id='apache2.config.in' Guid='{85BF72A1-FBA8-4955-ACCF-ABC83B1292C9}'>
+              <File KeyPath='yes' Name='apache2.config.in' />
+            </Component>
+            <Component Id='apache22.config.in' Guid='{6AEBA525-8F52-4D14-BAEE-0292A2E214D1}'>
+              <File KeyPath='yes' Name='apache22.config.in' />
+            </Component>
+            <Component Id='apache24.config.in' Guid='{6AEBA525-8F52-4D14-BAEE-0292A2E214D1}'>
+              <File KeyPath='yes' Name='apache24.config.in' />
             </Component>
             <Component Id='sslError.html' Guid='{A74BA230-C49F-4151-BBF4-AA80D554D099}'>
-              <File Name='sslError.html' />
+              <File KeyPath='yes' Name='sslError.html' />
             </Component>
             <Component Id='bindingTemplate.html' Guid='{F5A3A434-9209-43EC-9314-1F705055DDEC}'>
-              <File Name='bindingTemplate.html' />
+              <File KeyPath='yes' Name='bindingTemplate.html' />
             </Component>
             <Component Id='globalLogout.html' Guid='{E65F580D-5489-4D79-A8FC-F9FFED666FC1}'>
-              <File Name='globalLogout.html' />
+              <File KeyPath='yes' Name='globalLogout.html' />
             </Component>
             <Component Id='localLogout.html' Guid='{70FA3A47-A950-4074-BC13-C56D94497BD9}'>
-              <File Name='localLogout.html' />
+              <File KeyPath='yes' Name='localLogout.html' />
             </Component>
-            <Component Id='attributemap' Guid='{878C9456-E65F-4541-A0FA-975379EAC6B6}'>
-              <File Name='attribute-map.xml' />
+            <Component Id='attribute_map.xml' Guid='{878C9456-E65F-4541-A0FA-975379EAC6B6}'>
+              <File KeyPath='yes' Name='attribute-map.xml' />
             </Component>
-            <Component Id='attributepolicy' Guid='{55B88F7B-E2EA-4B70-87B7-33C566B9F992}'>
-              <File Name='attribute-policy.xml'/>
+            <Component Id='attribute_policy.xml' Guid='{55B88F7B-E2EA-4B70-87B7-33C566B9F992}'>
+              <File KeyPath='yes' Name='attribute-policy.xml'/>
             </Component>
             <Component Id='shibboleth2.xml' Guid='{E520FEDE-3F0E-47C6-9345-47223B82825A}'>
-              <File Name='shibboleth2.xml' />
+              <File KeyPath='yes' Name='shibboleth2.xml' Source='$(var.SPBuildDirectory)\cpp-sp\configs\win-shibboleth2.xml' />
             </Component>
             <Component Id='console.logger' Guid='{8AC85980-32B9-4EA2-9245-167FB1AB2570}'>
-              <File Name='console.logger' />
+              <File KeyPath='yes' Name='console.logger' />
             </Component>
             <Component Id='discoveryTemplate.html' Guid='{A9573113-4387-46DD-A636-84482AF2C672}'>
-              <File Name='discoveryTemplate.html' />
+              <File KeyPath='yes' Name='discoveryTemplate.html' />
             </Component>
             <Component Id='postTemplate.html' Guid='{5B7111E8-8E04-42F1-AB02-E47AFB7C3D28}'>
-              <File Name='postTemplate.html' />
+              <File KeyPath='yes' Name='postTemplate.html' />
             </Component>
             <Component Id='partialLogout.html' Guid='{E1F6208B-3C70-4632-B84C-C7D141DC4192}'>
-              <File Name='partialLogout.html' />
+              <File KeyPath='yes' Name='partialLogout.html' />
             </Component>
             <Component Id='protocols.xml' Guid='{B226CAAC-2D18-411A-9FBF-3FE237EBEF4D}'>
-              <File Name='protocols.xml' />
+              <File KeyPath='yes' Name='protocols.xml' />
             </Component>
-            <Component Id='securitypolicy.xml' Guid='{0EC04525-FCCF-4B60-8797-9B0CEC222B8C}'>
-              <File Name='security-policy.xml' />
+            <Component Id='security_policy.xml' Guid='{0EC04525-FCCF-4B60-8797-9B0CEC222B8C}'>
+              <File KeyPath='yes' Name='security-policy.xml' />
             </Component>
             <Component Id='accessError.html' Guid='{6FAA81A0-A020-4E60-A37D-1EC4D0D5FD06}'>
-              <File Name='accessError.html' />
-            </Component>
-            <Component Id='apache.config' Guid='{AF4EB2B1-2489-4E39-A89E-1CA7AC2B7483}'>
-              <File Name='apache.config.in' />
+              <File KeyPath='yes' Name='accessError.html' />
             </Component>
-            <Component Id='apache2.config' Guid='{85BF72A1-FBA8-4955-ACCF-ABC83B1292C9}'>
-              <File Name='apache2.config.in' KeyPath='yes' />
+            <Component Id='attrChecker.html' Guid='{BDF4837C-A887-4F1C-841C-DC13DFF8A46E}'>
+              <File KeyPath='yes' Name='attrChecker.html' />
             </Component>
             <Component Id='metadataError.html' Guid='{8C46D04A-A943-4FA4-AFCB-9B040306C2C0}'>
-              <File  Name='metadataError.html' KeyPath='yes' />
+              <File KeyPath='yes' Name='metadataError.html' />
             </Component>
-            <Component Id='native.logger' Guid='{8586D4C7-E237-4C7F-BC79-DE0B06473395}'>
-              <File Name='native.logger.in' KeyPath='yes' />
+            <Component Id='native.logger.in' Guid='{8586D4C7-E237-4C7F-BC79-DE0B06473395}'>
+              <File KeyPath='yes' Name='native.logger.in' />
             </Component>
             <Component Id='sessionError.html' Guid='{8AA240B3-DC5D-4687-B321-4F5E1BAEA820}'>
-              <File Name='sessionError.html' KeyPath='yes' />
+              <File KeyPath='yes' Name='sessionError.html' />
             </Component>
-            <Component Id='shibd.logger' Guid='{D8DA3D14-F779-4691-A883-4995158D2A74}'>
-              <File Name='shibd.logger.in' KeyPath='yes' />
+            <Component Id='shibd.logger.in' Guid='{D8DA3D14-F779-4691-A883-4995158D2A74}'>
+              <File KeyPath='yes' Name='shibd.logger.in' />
             </Component>
           </Directory><!-- etc_shibboleth_dist -->
         </Directory><!-- etc_shibboleth -->
       </Directory><!-- etc_dist -->
       <Directory Id='var' Name='var'>
+        <Directory Id='var_cache' Name='cache'>
+          <Directory Id='var_cache_shibboleth' Name='shibboleth'>
+            <Component Id='var_cache_shibboleth_folder' Guid='{6C978639-DDCF-40BD-90F8-690B3E05586C}'>
+              <CreateFolder />
+            </Component>
+          </Directory><!-- var_cache_shibboleth -->
+        </Directory><!-- var_cache -->
         <Directory Id='var_log' Name='log'>
           <Directory Id='var_log_shibboleth' Name='shibboleth'>
             <Component Id='var_log_shibboleth_folder' Guid='{2BFC84E4-634B-4D70-910A-D5640739C8C8}'>
@@ -159,12 +166,12 @@
             <Component Id='var_run_shibboleth_folder' Guid='{35E176B1-965A-4571-B24E-E0C8E69B0459}'>
               <CreateFolder />
             </Component>
-          </Directory>
+          </Directory><!-- var_run_shibboleth -->
         </Directory><!-- var_run -->
       </Directory><!-- var -->
     </DirectoryRef>
 
-    <Binary Id='EditConfigFileSrc' SourceFile='$(var.BuildDirectory)\cvs\2.0\cpp-sp\msi\scripts\shib_edit_config_files.vbs-wix' />
+    <Binary Id='EditConfigFileSrc' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\scripts\shib_edit_config_files.vbs-wix' />
 
     <CustomAction Id='EditConfigFiles' 
                   BinaryKey='EditConfigFileSrc' VBScriptCall='' Execute='deferred' Impersonate='no' />
@@ -173,10 +180,10 @@
     <CustomAction Id='KeyGen' BinaryKey='WixCA' DllEntry='CAQuietExec' Execute='deferred' Impersonate='no' />
     <CustomAction Id='SetKeyGen' Property='KeyGen' Value='&quot;[INSTALLDIR]etc\shibboleth\keygen.bat&quot;' />
 
-    <Binary Id='install_isapi' 
-            SourceFile='$(var.BuildDirectory)\cvs\2.0\cpp-sp\msi\scripts\shib_install_isapi_filter.vbs-wix'/>
+    <Binary Id='install_isapi'
+            SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\scripts\shib_install_isapi_filter.vbs-wix'/>
     <Binary Id='uninstall_isapi' 
-            SourceFile='$(var.BuildDirectory)\cvs\2.0\cpp-sp\msi\scripts\shib_uninstall_isapi_filter.vbs-wix'/>
+            SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\scripts\shib_uninstall_isapi_filter.vbs-wix'/>
 
     <CustomAction Id='SetShibInstallISAPIFilter32' Property='ShibInstallISAPIFilter' 
                   Value='[INSTALLDIR];@;[INSTALLDIR]lib\shibboleth\isapi_shib.dll;@;[SHIB_FILE_EXTENSION]' />
@@ -185,8 +192,7 @@
     <CustomAction Id='ShibInstallISAPIFilter' BinaryKey='install_isapi' 
                   VBScriptCall='' Execute='deferred' Impersonate='no' />
 
-    <CustomAction Id='SetShibUninstallISAPIFilter' Property='ShibUninstallISAPIFilter' 
-                  Value='[INSTALLDIR]'/>
+    <CustomAction Id='SetShibUninstallISAPIFilter' Property='ShibUninstallISAPIFilter' Value='[INSTALLDIR]'/>
     <CustomAction Id='ShibUninstallISAPIFilter' BinaryKey='uninstall_isapi' 
                   VBScriptCall='' Execute='deferred' Impersonate='no' />
 
@@ -234,54 +240,11 @@
         (NOT Installed) AND (INSTALL_SHIBD_SERVICE = "TRUE") AND (NOT ALREADYINSTALLED) AND (NOT INSTALL_32BIT) AND (IS64BITINSTALL = "TRUE")
       </Custom>
 
-
       <!-- Do not mess with SCM if this is an upgrade -->
 
       <InstallServices>(NOT Installed) AND (NOT ALREADYINSTALLED) AND (INSTALL_SHIBD_SERVICE = "TRUE")</InstallServices>
       <DeleteServices>(REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)</DeleteServices>
 
     </InstallExecuteSequence>
-    
-    <!-- Components
-         <ComponentRef Id='main.css'/>
-         <ComponentRef Id='logo.jpg'/>
-         <ComponentRef Id='CREDITS.txt'/>
-         <ComponentRef Id='LICENSE.txt'/>
-         <ComponentRef Id='NOTICE.txt'/>
-         <ComponentRef Id='README.txt'/>
-         <ComponentRef Id='RELEASE.txt'/>
-         
-         <ComponentRef Id='openssl.cnf'/>
-         <ComponentRef Id='upgrade.xsl'/>
-         <ComponentRef Id='examplemetadata.xml'/>
-         <ComponentRef Id='exampleshibboleth2.xml' 
-         <ComponentRef Id='xsltproc.js'/>
-         <ComponentRef Id='keygen.bat'/>
-
-         <ComponentRef Id='dist_noperm'/>
-         <ComponentRef Id='sslError.html'/>
-         <ComponentRef Id='bindingTemplate.html'/>
-         <ComponentRef Id='globalLogout.html'/>
-         <ComponentRef Id='localLogout.html'/>
-         <ComponentRef Id='attributemap'/>
-         <ComponentRef Id='attributepolicy'/>
-         <ComponentRef Id='shibboleth2.xml'/>
-         <ComponentRef Id='console.logger'/>
-         <ComponentRef Id='discoveryTemplate.html'/>
-         <ComponentRef Id='postTemplate.html'/>
-         <ComponentRef Id='partialLogout.html'/>
-         <ComponentRef Id='protocols.xml'/>
-         <ComponentRef Id='security-policy.xml'
-
-         <ComponentRef Id='accessError.html'/>
-         <ComponentRef Id='apache.config'/>
-         <ComponentRef Id='apache2.config'/>
-         <ComponentRef Id='metadataError.html'/>
-         <ComponentRef Id='native.logger'/>
-         <ComponentRef Id='sessionError.html'/>
-         <ComponentRef Id='shibd.logger'/>
-         <ComponentRef Id='var_log_shibboleth_folder'/>
-         <ComponentRef Id='var_run_shibboleth_folder'/>  
-         -->
   </Fragment>
 </Wix>
diff --git a/msi/WiX/ShibbolethSP-properties.wxi b/msi/WiX/ShibbolethSP-properties.wxi
index a2a383e..7230847 100644
--- a/msi/WiX/ShibbolethSP-properties.wxi
+++ b/msi/WiX/ShibbolethSP-properties.wxi
@@ -36,16 +36,14 @@
   <Property Id='ARPCONTACT' Value='contact@shibboleth.net' />
   <Property Id='ARPHELPLINK' Value='https://wiki.shibboleth.net/confluence/display/SHIB2/Installation+and+Configuration' />
   <Property Id='ARPURLUPDATEINFO' Value='https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPWindowsUpgrade' />
-  <Property Id='ARPURLINFOABOUT' Value='http://www.shibboleth.net/' />
+  <Property Id='ARPURLINFOABOUT' Value='http://shibboleth.net/' />
 
   <!-- UPGRADINGPRODUCTCODE set in the uninstall if this is an upgrade uninstall -->
   <!-- IISMAJORVERSION if IIS installed -->
   <PropertyRef Id='IISMAJORVERSION' />
 
-
-  <!-- ALREADYINSTALLED if we are doig an upgrade -->
+  <!-- ALREADYINSTALLED if we are doing an upgrade -->
   <Upgrade Id='$(var.ShibbolethUpgradeCode)'>
     <UpgradeVersion ExcludeLanguages='yes' IncludeMaximum='yes' Maximum='127.255.255' Minimum='0.0.1' OnlyDetect='yes' Property='ALREADYINSTALLED'/>
   </Upgrade>
 </Include>
-
diff --git a/msi/WiX/ShibbolethSP-registry-x64.wxs b/msi/WiX/ShibbolethSP-registry-x64.wxs
index 789afdc..fa91cdc 100644
--- a/msi/WiX/ShibbolethSP-registry-x64.wxs
+++ b/msi/WiX/ShibbolethSP-registry-x64.wxs
@@ -19,10 +19,11 @@
 <?include Versions.wxi ?>
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-  <!-- This is where we put all the architecture neutral bits of the
-       Shibboleth install.  It turns out that it may not be all the
-       architecture insenstive stuff since some GUIDS may have moved
-       -->
+  <!--
+    This is where we put all the architecture neutral bits of the
+    Shibboleth install.  It turns out that it may not be all the
+    architecture insenstive stuff since some GUIDS may have moved
+  -->
   <Fragment>
 
     <!-- Previous version search -->
@@ -64,15 +65,10 @@
       </Component>
 
       <Component Id='shib64.ico' Guid='{AB12F477-E49D-4E52-B130-AF0913AF9EC9}' Win64='yes'>
-        <File Id='shib64.ico' KeyPath='yes' Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\msi\shib.ico'/>
+        <File Id='shib64.ico' KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-sp\msi\shib.ico'/>
         <RegistryValue Id='DisplayIcon64' Root='HKLM' Key='Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductCode]' 
                        Name='DisplayIcon' Value='[#shib64.ico],0' Type='string' />
       </Component>
     </DirectoryRef>
-  <!--
-     <ComponentRef Id='file_extension64'/>
-     <ComponentRef Id='shib64.ico' />
-     -->
-
   </Fragment>
 </Wix>
diff --git a/msi/WiX/ShibbolethSP-registry-x86.wxs b/msi/WiX/ShibbolethSP-registry-x86.wxs
index 712a3ba..ac988a4 100644
--- a/msi/WiX/ShibbolethSP-registry-x86.wxs
+++ b/msi/WiX/ShibbolethSP-registry-x86.wxs
@@ -19,10 +19,11 @@
 <?include Versions.wxi ?>
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-  <!-- This is where we put all the architecture neutral bits of the
-       Shibboleth install.  It turns out that it may not be all the
-       architecture insenstive stuff since some GUIDS may have moved
-       -->
+  <!--
+    This is where we put all the architecture neutral bits of the
+    Shibboleth install.  It turns out that it may not be all the
+    architecture insenstive stuff since some GUIDS may have moved
+  -->
   <Fragment>
     <!-- Previous version search -->
     <Property Id='SHIB_OLDVERSION' Value='none' Secure='yes'>
@@ -72,15 +73,10 @@
       </Component>
 
       <Component Id='shib.ico' Guid='{FA0F86A1-0731-4D66-8216-BC74D231B598}'>
-        <File KeyPath='yes' Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\msi\shib.ico' />
+        <File KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-sp\msi\shib.ico' />
         <RegistryValue Root='HKLM' Key='Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductCode]' 
                        Name='DisplayIcon' Value='[#shib.ico],0' Type='string' />
       </Component>
     </DirectoryRef>
-  <!--
-     <ComponentRef Id='file_extension'/>
-     <ComponentRef Id='shib.ico' />
-     -->
-
   </Fragment>
 </Wix>
diff --git a/msi/WiX/ShibbolethSP-shibd-dialog.wxs b/msi/WiX/ShibbolethSP-shibd-dialog.wxs
index 1455ade..0a3981f 100644
--- a/msi/WiX/ShibbolethSP-shibd-dialog.wxs
+++ b/msi/WiX/ShibbolethSP-shibd-dialog.wxs
@@ -49,7 +49,7 @@
         <Control Id='ShibdLine2' Type='Text' X='25' Y='79' Width='312' Height='20' 
                  Text='NOTE: This is NOT the web server port and MUST be a valid Windows port number that is NOT in use by any other process!'/>
         <Control Id='ShibdLine3' Type='Text' X='25' Y='108' Width='312' Height='20' 
-                 Text='If a copy of shibboleth.xml already exists in the installation path, it will NOT be updated with this new port number.'/>
+                 Text='If a copy of shibboleth2.xml already exists in the installation path, it will NOT be updated with this new port number.'/>
         <Control Id='InstallShibdCheckBox' Type='CheckBox' X='118' Y='154' Width='96' Height='14' 
                  Property='INSTALL_SHIBD_SERVICE' Text='Install Shibd daemon' 
                  CheckBoxValue='TRUE' TabSkip='yes' />
diff --git a/msi/WiX/Versions.wxi b/msi/WiX/Versions.wxi
index 4db984c..238d9ba 100644
--- a/msi/WiX/Versions.wxi
+++ b/msi/WiX/Versions.wxi
@@ -21,7 +21,7 @@
   <?define SPBuildDirectory='C:\Users\scantor\Shibboleth\git\' ?>
   
   <!-- Do not confuse ShibbolethDllVersion with ShibbolethVersion -->
-  <?define ShibbolethVersion='2.4.186'?>
+  <?define ShibbolethVersion='2.5.0'?>
   <!-- DO NOT CHANGE UpgradeCode -->
   <?define ShibbolethUpgradeCode='{28A4EB62-E860-49CA-BE43-44ADEB91DBF6}' ?>
 
@@ -33,16 +33,16 @@
 
   <?define LogForShibFileVersion='1_0' ?> <!-- '$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\x64\Release\'> -->
 
-  <?define OpenSAMLVersion='2.4.3' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->
-  <?define OpenSAMLFileVersion='2_4' ?><!-- 'saml$(var.OpenSAMLFileVersion).dll' -->
+  <?define OpenSAMLVersion='2.5.0' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->
+  <?define OpenSAMLFileVersion='2_5' ?><!-- 'saml$(var.OpenSAMLFileVersion).dll' -->
 
   <?define OpenSSLVersion='1.0.0.9' ?><!-- 1.0.0i -->
   <?define OpenSSLDirVersion='1.0.0i' ?><!-- '$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll.dbg\'> -->
   <?define OpenSSLFileVersion='1_0_0' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->
 
   <!-- Do not confuse ShibbolethDllVersion with ShibbolethVersion -->
-  <?define ShibbolethDllFileVersion='1_4' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->
-  <?define ShibbolethDllVersion='1.4.2' ?>
+  <?define ShibbolethDllFileVersion='1_5' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->
+  <?define ShibbolethDllVersion='1.5.0' ?>
 
   <?define XercesVersion='3.1.1' ?><!-- $(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86_64-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion).dll' -->
   <?define XercesFileVersion='3_1' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->
@@ -50,8 +50,8 @@
   <?define XmlSecVersion='1.6.1' ?><!-- '$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Release No Xalan' -->
   <?define XmlSecFileVersion='1_6' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->
 
-  <?define XmlToolingVersion='1.4.2' ?>
-  <?define XmlToolingFileVersion='1_4' ?><!--'xmltooling$(var.XmlToolingFileVersion)D.dll'-->
+  <?define XmlToolingVersion='1.5.0' ?>
+  <?define XmlToolingFileVersion='1_5' ?><!--'xmltooling$(var.XmlToolingFileVersion)D.dll'-->
 
   <?define ZlibVersion='1.2.5' ?><!--'$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\projects\visualc6\Win32_DLL_Release\zlib$(var.ZlibFileVersion).dll'-->
   <?define ZlibFileVersion='1' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->
-- 
2.1.4