From a0ecb351fef7987d5dafd700099afae83bce6678 Mon Sep 17 00:00:00 2001
From: Rod Widdowson <rdw@steadingsoftware.com>
Date: Wed, 2 May 2012 14:29:25 +0000
Subject: [PATCH] More work on x64 bit merge modules.  More work needed around
 the commo schemas

---
 msi/WiX/MergeModules/Curl-x64.wxs           |  57 +++++++++++
 msi/WiX/MergeModules/Curl-x64.wxs~          |  61 ++++++++++++
 msi/WiX/MergeModules/Curl-x86.wxs           |   7 +-
 msi/WiX/MergeModules/FastCGI-x64.wxs        |  57 +++++++++++
 msi/WiX/MergeModules/FastCGI-x64.wxs~       |  60 ++++++++++++
 msi/WiX/MergeModules/FastCGI-x86.wxs        |  17 ++--
 msi/WiX/MergeModules/Log4Shib-x64.wxs       |  60 ++++++++++++
 msi/WiX/MergeModules/Log4Shib-x64.wxs~      |  67 +++++++++++++
 msi/WiX/MergeModules/Log4Shib-x86.wxs       |  33 +++----
 msi/WiX/MergeModules/OpenSAML-schemas.wxs   | 145 ++++++++++++++++------------
 msi/WiX/MergeModules/OpenSAML-x64.wxs       |  61 ++++++++++++
 msi/WiX/MergeModules/OpenSAML-x64.wxs~      |  74 ++++++++++++++
 msi/WiX/MergeModules/OpenSAML-x86.wxs       |  29 ++----
 msi/WiX/MergeModules/OpenSSL-x64-files.wxs~ |  78 +++++++++++++++
 msi/WiX/MergeModules/OpenSSL-x64.wxs        |  66 +++++++++++++
 msi/WiX/MergeModules/OpenSSL-x64.wxs~       |  78 +++++++++++++++
 msi/WiX/MergeModules/OpenSSL-x86-files.wxs~ |  78 +++++++++++++++
 msi/WiX/MergeModules/OpenSSL-x86.wxs        |  38 +++-----
 msi/WiX/MergeModules/Shibboleth-x64.wxs     |  67 +++++++++++++
 msi/WiX/MergeModules/Shibboleth-x64.wxs~    |  66 +++++++++++++
 msi/WiX/MergeModules/Shibboleth-x86.wxs     |  30 +++---
 msi/WiX/MergeModules/Xerces-x64.wxs         |  51 ++++++++++
 msi/WiX/MergeModules/Xerces-x64.wxs~        |  55 +++++++++++
 msi/WiX/MergeModules/Xerces-x86.wxs         |   8 +-
 msi/WiX/MergeModules/XmlSec-x64.wxs         |  88 +++++++++++++++++
 msi/WiX/MergeModules/XmlSec-x86.wxs         |  56 ++++-------
 msi/WiX/MergeModules/XmlTooling-schemas.wxs |  33 ++++---
 msi/WiX/MergeModules/XmlTooling-x64.wxs     |  59 +++++++++++
 msi/WiX/MergeModules/XmlTooling-x64.wxs~    |  67 +++++++++++++
 msi/WiX/MergeModules/XmlTooling-x86.wxs     |  30 ++----
 msi/WiX/MergeModules/Zlib-x64.wxs           |  51 ++++++++++
 msi/WiX/MergeModules/Zlib-x64.wxs~          |  51 ++++++++++
 msi/WiX/MergeModules/Zlib-x86.wxs           |   4 +-
 msi/WiX/MergeModules/te2.wxs                |  69 +++++++++++++
 msi/WiX/MergeModules/te2.wxs~               |  64 ++++++++++++
 msi/WiX/MergeModules/tes.wxs                |  81 ++++++++++++++++
 msi/WiX/MergeModules/tes.wxs~               |  81 ++++++++++++++++
 37 files changed, 1841 insertions(+), 236 deletions(-)
 create mode 100644 msi/WiX/MergeModules/Curl-x64.wxs
 create mode 100644 msi/WiX/MergeModules/Curl-x64.wxs~
 create mode 100644 msi/WiX/MergeModules/FastCGI-x64.wxs
 create mode 100644 msi/WiX/MergeModules/FastCGI-x64.wxs~
 create mode 100644 msi/WiX/MergeModules/Log4Shib-x64.wxs
 create mode 100644 msi/WiX/MergeModules/Log4Shib-x64.wxs~
 create mode 100644 msi/WiX/MergeModules/OpenSAML-x64.wxs
 create mode 100644 msi/WiX/MergeModules/OpenSAML-x64.wxs~
 create mode 100644 msi/WiX/MergeModules/OpenSSL-x64-files.wxs~
 create mode 100644 msi/WiX/MergeModules/OpenSSL-x64.wxs
 create mode 100644 msi/WiX/MergeModules/OpenSSL-x64.wxs~
 create mode 100644 msi/WiX/MergeModules/OpenSSL-x86-files.wxs~
 create mode 100644 msi/WiX/MergeModules/Shibboleth-x64.wxs
 create mode 100644 msi/WiX/MergeModules/Shibboleth-x64.wxs~
 create mode 100644 msi/WiX/MergeModules/Xerces-x64.wxs
 create mode 100644 msi/WiX/MergeModules/Xerces-x64.wxs~
 create mode 100644 msi/WiX/MergeModules/XmlSec-x64.wxs
 create mode 100644 msi/WiX/MergeModules/XmlTooling-x64.wxs
 create mode 100644 msi/WiX/MergeModules/XmlTooling-x64.wxs~
 create mode 100644 msi/WiX/MergeModules/Zlib-x64.wxs
 create mode 100644 msi/WiX/MergeModules/Zlib-x64.wxs~
 create mode 100644 msi/WiX/MergeModules/te2.wxs
 create mode 100644 msi/WiX/MergeModules/te2.wxs~
 create mode 100644 msi/WiX/MergeModules/tes.wxs
 create mode 100644 msi/WiX/MergeModules/tes.wxs~

diff --git a/msi/WiX/MergeModules/Curl-x64.wxs b/msi/WiX/MergeModules/Curl-x64.wxs
new file mode 100644
index 0000000..857d5f2
--- /dev/null
+++ b/msi/WiX/MergeModules/Curl-x64.wxs
@@ -0,0 +1,57 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?define BuildDirectory='G:\Downloads\shib\' ?>
+<?define CurlVersion='7.21.2' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='CurlMergeModule_x64' Language='1033' Version='$(var.CurlVersion)'>
+    <Package Id='{DB1A5E0D-0052-40F3-9D7B-469CCD0CEB2D}' Description='Merge Module for CURL (x64)'
+             Comments='This module is built by the Shibboleth Consortium.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>
+
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>
+        <Directory Id='shibboleth' Name='Shibboleth'>
+          <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'/>
+              </Component>
+              <Component Id='curl.exe' Guid='{52103377-AEF6-4533-B0CE-D3A786D2D17E}' Win64='yes'>
+                <File KeyPath='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'/>
+                </Component>
+                <Component Id='curl.exe_debug' Guid='{F363D42B-8CB6-4ED8-B2D3-3637B6110E38}' Win64='yes'>
+                  <File Id='curl.exe_debug' KeyPath='yes' 
+                        Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\src\debug.x64\curl.exe'/>
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+          </Directory><!-- shibboleth_SP -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix>
diff --git a/msi/WiX/MergeModules/Curl-x64.wxs~ b/msi/WiX/MergeModules/Curl-x64.wxs~
new file mode 100644
index 0000000..23e2ead
--- /dev/null
+++ b/msi/WiX/MergeModules/Curl-x64.wxs~
@@ -0,0 +1,61 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?define BuildDirectory='G:\Downloads\shib\' ?>
+<?define CurlVersion='7.21.2' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='CurlMergeModule_x86' Language='1033' Version='$(var.CurlVersion)'>
+    <Package Id='10467105-6375-49E1-AC35-045084BD8FA4' Description='Merge Module for CURL'
+             Comments='This module is built by the Shibboleth Consortium.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>
+
+    <!-- For now just install this where it is put we expect to go into lib and lib\debug below.  
+         At a a later date, we may chose to make this a placed module  -->
+
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
+        <Directory Id='shibboleth' Name='Shibboleth'>
+          <Directory Id='shibboleth_sp' Name='SP'>
+            <Directory Id='lib' Name='lib'>
+
+              <Component Id='libcurl.dll' Guid='{8F72A198-4D90-47DC-BBAC-123D51DE4192}'>
+                <File KeyPath='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' 
+                      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' 
+                        Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll\libcurld.dll'/>
+                </Component>
+                <Component Id='curl.exe1' Guid='{FB6BF939-9744-49ED-ACBF-8956B9C5DE29}'>
+                  <File Id='curl.exe_debug' KeyPath='yes' 
+                        Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\src\debug\curl.exe'/>
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+          </Directory><!-- shibboleth_SP -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix>
diff --git a/msi/WiX/MergeModules/Curl-x86.wxs b/msi/WiX/MergeModules/Curl-x86.wxs
index 23e2ead..2272bdc 100644
--- a/msi/WiX/MergeModules/Curl-x86.wxs
+++ b/msi/WiX/MergeModules/Curl-x86.wxs
@@ -21,12 +21,9 @@
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Module Id='CurlMergeModule_x86' Language='1033' Version='$(var.CurlVersion)'>
-    <Package Id='10467105-6375-49E1-AC35-045084BD8FA4' Description='Merge Module for CURL'
+    <Package Id='10467105-6375-49E1-AC35-045084BD8FA4' Description='Merge Module for CURL (x86)'
              Comments='This module is built by the Shibboleth Consortium.'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>
-
-    <!-- For now just install this where it is put we expect to go into lib and lib\debug below.  
-         At a a later date, we may chose to make this a placed module  -->
+             Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x64'/>
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
diff --git a/msi/WiX/MergeModules/FastCGI-x64.wxs b/msi/WiX/MergeModules/FastCGI-x64.wxs
new file mode 100644
index 0000000..0baf43a
--- /dev/null
+++ b/msi/WiX/MergeModules/FastCGI-x64.wxs
@@ -0,0 +1,57 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?define BuildDirectory='G:\Downloads\shib\' ?>
+<?define FastCGIVersion='2.4.0' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='FastCGIMergeModule_x64' Language='1033' Version='$(var.FastCGIVersion)'>
+    <Package Id='{4820855A-68B9-4EBB-94CD-4C1F9DA6EB02}' Description='Merge Module for FastCGI (x64)'
+             Comments='This module is built by the Shibboleth Consortium.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>
+
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>
+        <Directory Id='shibboleth' Name='Shibboleth'>
+          <Directory Id='shibboleth_SP' Name='SP'>
+            <Directory Id='lib' Name='lib'>
+              <Component Id='libfcgi.dll21' Guid='{B3854D00-6E8A-4107-B1E3-26DD71F1C43D}' Win64='yes'>
+                <File KeyPath='yes' 
+                      Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\x64\Release\libfcgi.dll' />
+              </Component>
+              <Directory Id='lib_debug' Name='debug'>
+                <Component Id='libfcgi.dll' Guid='{A7EF753D-0729-47A2-BFBB-56C7152CF4A7}' Win64='yes'>
+                  <File KeyPath='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' 
+                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\FASTCGI.LICENSE' />
+              </Component>
+            </Directory><!-- doc -->
+          </Directory><!-- shibboleth -->
+        </Directory><!-- shibboleth_SP -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix>
+
+
diff --git a/msi/WiX/MergeModules/FastCGI-x64.wxs~ b/msi/WiX/MergeModules/FastCGI-x64.wxs~
new file mode 100644
index 0000000..8a9a753
--- /dev/null
+++ b/msi/WiX/MergeModules/FastCGI-x64.wxs~
@@ -0,0 +1,60 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?define BuildDirectory='G:\Downloads\shib\' ?>
+<?define FastCGIVersion='2.4.0' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='FastCGIMergeModule_x86' Language='1033' Version='$(var.FastCGIVersion)'>
+    <Package Id='{2C0C288C-D24D-48E0-9BAD-DEFD6A8D8D64}' Description='Merge Module for FastCGI'
+             Comments='This module is built by the Shibboleth Consortium.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>
+
+    <!-- For now just install this where it is put we expect to go into lib and lib\debug below.  
+         At a a later date, we may chose to make this a placed module  -->
+
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
+        <Directory Id='shibboleth' Name='Shibboleth'>
+          <Directory Id='shibboleth_SP' Name='SP'>
+            <Directory Id='lib' Name='lib'>
+              <Component Id='libfcgi.dll21' Guid='{FD6F8E32-CBDF-4662-A39C-8EC713483C51}'>
+                <File KeyPath='yes' 
+                      Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\Release\libfcgi.dll' />
+              </Component>
+              <Directory Id='lib_debug' Name='debug'>
+                <Component Id='libfcgi.dll' Guid='{682FFA3A-D517-4332-BCC5-EF24252C3528}'>
+                  <File KeyPath='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' 
+                        Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\FASTCGI.LICENSE' />
+                </Component>
+            </Directory><!-- doc -->
+          </Directory><!-- shibboleth -->
+        </Directory><!-- shibboleth_SP -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix>
+
+
diff --git a/msi/WiX/MergeModules/FastCGI-x86.wxs b/msi/WiX/MergeModules/FastCGI-x86.wxs
index 2dc293c..a172c66 100644
--- a/msi/WiX/MergeModules/FastCGI-x86.wxs
+++ b/msi/WiX/MergeModules/FastCGI-x86.wxs
@@ -21,12 +21,9 @@
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Module Id='FastCGIMergeModule_x86' Language='1033' Version='$(var.FastCGIVersion)'>
-    <Package Id='{2C0C288C-D24D-48E0-9BAD-DEFD6A8D8D64}' Description='Merge Module for FastCGI'
+    <Package Id='{2C0C288C-D24D-48E0-9BAD-DEFD6A8D8D64}' Description='Merge Module for FastCGI (x86)'
              Comments='This module is built by the Shibboleth Consortium.'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>
-
-    <!-- For now just install this where it is put we expect to go into lib and lib\debug below.  
-         At a a later date, we may chose to make this a placed module  -->
+             Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x86'/>
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
@@ -45,12 +42,10 @@
               </Directory><!-- lib_debug-->
             </Directory><!-- lib -->
             <Directory Id='doc' Name='doc'>
-              <Directory Id='doc_shibboleth' Name='shibboleth'>
-                <Component Id='FASTCGI.LICENSE' Guid='{3FB61369-D8A7-4076-B659-DEDA2558A1AF}'>
-                  <File KeyPath='yes' 
-                        Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\FASTCGI.LICENSE' />
-                </Component>
-              </Directory><!-- doc_shibboleth-->
+              <Component Id='FASTCGI.LICENSE' Guid='{3FB61369-D8A7-4076-B659-DEDA2558A1AF}'>
+                <File KeyPath='yes' 
+                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\FASTCGI.LICENSE' />
+              </Component>
             </Directory><!-- doc -->
           </Directory><!-- shibboleth -->
         </Directory><!-- shibboleth_SP -->
diff --git a/msi/WiX/MergeModules/Log4Shib-x64.wxs b/msi/WiX/MergeModules/Log4Shib-x64.wxs
new file mode 100644
index 0000000..417798d
--- /dev/null
+++ b/msi/WiX/MergeModules/Log4Shib-x64.wxs
@@ -0,0 +1,60 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?define BuildDirectory='G:\Downloads\shib\' ?>
+<?define LogForShibVersion='1.0.5' ?>
+<?define LogForShibFileVersion='1_0' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='Log4ShibMergeModule_x86' Language='1033' Version='$(var.LogForShibVersion)'>
+    <Package Id='{A2D51A0D-847A-4941-80FC-C8C8E697565F}' Description='Merge Module for Log4Shib (x64)'
+             Comments='This module is built by the Shibboleth Consortium. Includes log4cpp/shib and NTEventLogAppender.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>
+
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>
+        <Directory Id='shibboleth' Name='Shibboleth'>
+          <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'/>
+              </Component>
+              <Component Id='NTEventLogAppender.dll' Guid='{1A559035-DCA4-4297-AE94-C3E6ABB37662}' Win64='yes'>
+                <File KeyPath='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'/>
+                </Component>
+                <Component Id='NTEventLogAppender.dll_debug' Guid='{6C23C432-EA11-4313-9F5F-DBB09A8752E8}' Win64='yes'>
+                  <File Id='NTEventLogAppenderD.dll' KeyPath='yes' Name='NTEventLogAppender.dll'/>
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+            <Directory Id='doc' Name='doc'>
+              <Component Id='LOG4CPP.LICENSE' Guid='{6332D7BE-90A0-4698-B1E9-06AE8163F5A8}' Win64='yes'>
+                <File KeyPath='yes' 
+                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\LOG4CPP.LICENSE' />
+              </Component>
+            </Directory><!-- doc -->
+          </Directory><!-- shibboleth_SP -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix>
diff --git a/msi/WiX/MergeModules/Log4Shib-x64.wxs~ b/msi/WiX/MergeModules/Log4Shib-x64.wxs~
new file mode 100644
index 0000000..7668b52
--- /dev/null
+++ b/msi/WiX/MergeModules/Log4Shib-x64.wxs~
@@ -0,0 +1,67 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?define BuildDirectory='G:\Downloads\shib\' ?>
+<?define LogForShibVersion='1.0.5' ?>
+<?define LogForShibFileVersion='1_0' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='Log4ShibMergeModule_x86' Language='1033' Version='$(var.LogForShibVersion)'>
+    <Package Id='1AD64745-CA05-41AF-B5E9-A59AA4A1C134' Description='Merge Module for Log4Shib'
+             Comments='This module is built by the Shibboleth Consortium. Includes log4cpp/shib and NTEventLogAppender.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>
+
+    <!-- For now just install this where it is put we expect to go into lib and lib\debug below.  
+         At a a later date, we may chose to make this a placed module  -->
+
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
+        <Directory Id='shibboleth' Name='Shibboleth'>
+          <Directory Id='shibboleth_SP' Name='SP'>
+            <Directory Id='lib' Name='lib'>
+              <Component Id='log4shib.dll' Guid='{2FDE8ED0-774A-4F44-88D5-C7089350D895}'>
+                <File KeyPath='yes' 
+                      Source='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Release\log4shib$(var.LogForShibFileVersion).dll'/>
+              </Component>
+              <Component Id='NTEventLogAppender.dll' Guid='{43B944CB-E42A-4D17-A601-AC4E14DA2217}'>
+                <File KeyPath='yes' 
+                      Source='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Release\NTEventLogAppender.dll'/>
+              </Component>
+              <Directory Id='lib_debug' Name='debug'>
+                <Component Id='log4shibD.dll' Guid='{B8D2E797-F5A8-4E0D-B57F-9A7D4E699942}'>
+                  <File KeyPath='yes' 
+                        Source='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Debug\log4shib$(var.LogForShibFileVersion)D.dll'/>
+                </Component>
+                <Component Id='NTEventLogAppender.dll_debug' Guid='{5501F9FA-C6EC-48A7-8318-EA8C918DC8BF}'>
+                  <File Id='NTEventLogAppenderD.dll' KeyPath='yes' 
+                        Source='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Debug\NTEventLogAppender.dll'/>
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+            <Directory Id='doc' Name='doc'>
+              <Component Id='LOG4CPP.LICENSE' Guid='{10B0BF4F-ED70-4B49-BFBA-947EB6AA6B21}'>
+                <File KeyPath='yes' 
+                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\LOG4CPP.LICENSE' />
+              </Component>
+            </Directory><!-- doc -->
+          </Directory><!-- shibboleth_SP -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix>
diff --git a/msi/WiX/MergeModules/Log4Shib-x86.wxs b/msi/WiX/MergeModules/Log4Shib-x86.wxs
index fa6922d..3553681 100644
--- a/msi/WiX/MergeModules/Log4Shib-x86.wxs
+++ b/msi/WiX/MergeModules/Log4Shib-x86.wxs
@@ -22,44 +22,35 @@
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Module Id='Log4ShibMergeModule_x86' Language='1033' Version='$(var.LogForShibVersion)'>
-    <Package Id='1AD64745-CA05-41AF-B5E9-A59AA4A1C134' Description='Merge Module for Log4Shib'
+    <Package Id='1AD64745-CA05-41AF-B5E9-A59AA4A1C134' Description='Merge Module for Log4Shib (x86)'
              Comments='This module is built by the Shibboleth Consortium. Includes log4cpp/shib and NTEventLogAppender.'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>
-
-    <!-- For now just install this where it is put we expect to go into lib and lib\debug below.  
-         At a a later date, we may chose to make this a placed module  -->
+             Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x86'/>
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
         <Directory Id='shibboleth' Name='Shibboleth'>
           <Directory Id='shibboleth_SP' Name='SP'>
-            <Directory Id='lib' Name='lib'>
+            <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' 
-                      Source='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Release\log4shib$(var.LogForShibFileVersion).dll'/>
+                <File KeyPath='yes' Name='log4shib$(var.LogForShibFileVersion).dll'/>
               </Component>
               <Component Id='NTEventLogAppender.dll' Guid='{43B944CB-E42A-4D17-A601-AC4E14DA2217}'>
-                <File KeyPath='yes' 
-                      Source='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Release\NTEventLogAppender.dll'/>
+                <File KeyPath='yes' Name='NTEventLogAppender.dll'/>
               </Component>
-              <Directory Id='lib_debug' Name='debug'>
+              <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' 
-                        Source='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Debug\log4shib$(var.LogForShibFileVersion)D.dll'/>
+                  <File KeyPath='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' 
-                        Source='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Debug\NTEventLogAppender.dll'/>
+                  <File Id='NTEventLogAppenderD.dll' KeyPath='yes' Name='NTEventLogAppender.dll'/>
                 </Component>
               </Directory><!-- lib_debug-->
             </Directory><!-- lib -->
             <Directory Id='doc' Name='doc'>
-              <Directory Id='doc_shibboleth' Name='shibboleth'>
-                <Component Id='LOG4CPP.LICENSE' Guid='{10B0BF4F-ED70-4B49-BFBA-947EB6AA6B21}'>
-                  <File KeyPath='yes' 
-                        Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\LOG4CPP.LICENSE' />
-                </Component>
-              </Directory><!-- doc_shibboleth-->
+              <Component Id='LOG4CPP.LICENSE' Guid='{10B0BF4F-ED70-4B49-BFBA-947EB6AA6B21}'>
+                <File KeyPath='yes' 
+                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\LOG4CPP.LICENSE' />
+              </Component>
             </Directory><!-- doc -->
           </Directory><!-- shibboleth_SP -->
         </Directory><!-- shibboleth -->
diff --git a/msi/WiX/MergeModules/OpenSAML-schemas.wxs b/msi/WiX/MergeModules/OpenSAML-schemas.wxs
index 777eee2..216d779 100644
--- a/msi/WiX/MergeModules/OpenSAML-schemas.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-schemas.wxs
@@ -20,71 +20,88 @@
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Fragment>
-    <DirectoryRef Id='share_xml_opensaml'
-                  FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\' >
-      <Component Id='schema_assertion_01' Guid='{3BB83A55-9212-40F4-86E1-D95CEDAE5501}'>
-        <File Name='cs-sstc-schema-assertion-01.xsd' KeyPath='yes' />
-      </Component>
-      <Component Id='schema_assertion_1_1' Guid='{71ED2BC0-50EE-48D5-9649-5F7C5A8388F3}'>
-        <File Name='cs-sstc-schema-assertion-1.1.xsd' KeyPath='yes' />
-      </Component>
-      <Component Id='schema_protocol_1_1' Guid='{DD3829CB-F91A-4291-85F8-771E0930E9F1}'>
-        <File Name="cs-sstc-schema-protocol-01.xsd" KeyPath="yes" />
-      </Component>
-      <Component Id='schema_protocol_01' Guid='{E0CD8123-B42F-4F15-B4B4-A4F99DE68F8E}'>
-        <File Name='cs-sstc-schema-protocol-1.1.xsd'/>
-      </Component>
-      <Component Id='samlschema' Guid='{355CA6A9-57F9-491D-8D1A-33161CDE6DF1}' >
-        <File Name='saml10-catalog.xml' Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\saml10-catalog.xml.in' />
-        <File Name='saml11-catalog.xml' Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\saml11-catalog.xml.in' />
-        <File Name='saml20-catalog.xml' Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\saml20-catalog.xml.in' />
+    <DirectoryRef Id='TARGETDIR'>
+      <Directory Id='CommonAppDataFolder' Name='CommonFiles' >
+        <Directory Id='common_shibboleth' Name='Shibboleth' >
+          <Directory Id='common_sp' Name='SP' >
+            <Directory Id='common_doc' Name='doc'
+                       FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\' >
+              <Component Id='schema_assertion_01' Guid='{3BB83A55-9212-40F4-86E1-D95CEDAE5501}'>
+                <File Name='cs-sstc-schema-assertion-01.xsd' KeyPath='yes' />
+              </Component>
+              <Component Id='schema_assertion_1_1' Guid='{71ED2BC0-50EE-48D5-9649-5F7C5A8388F3}'>
+                <File Name='cs-sstc-schema-assertion-1.1.xsd' KeyPath='yes' />
+              </Component>
+              <Component Id='schema_protocol_1_1' Guid='{DD3829CB-F91A-4291-85F8-771E0930E9F1}'>
+                <File Name="cs-sstc-schema-protocol-01.xsd" KeyPath="yes" />
+              </Component>
+              <Component Id='schema_protocol_01' Guid='{E0CD8123-B42F-4F15-B4B4-A4F99DE68F8E}'>
+                <File Name='cs-sstc-schema-protocol-1.1.xsd'/>
+              </Component>
+              <Component Id='samlschema' Guid='{355CA6A9-57F9-491D-8D1A-33161CDE6DF1}' >
+                <File Name='saml10-catalog.xml' 
+                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\saml10-catalog.xml.in' />
+                <File Name='saml11-catalog.xml' 
+                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\saml11-catalog.xml.in' />
+                <File Name='saml20-catalog.xml' 
+                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\saml20-catalog.xml.in' />
+                <File Name='saml-schema-assertion-2.0.xsd'/>
+                <File Name='saml-schema-authn-context-2.0.xsd'/>
+                <File Id='a_c_auth_telephony2.0.xsd' 
+                      Name='saml-schema-authn-context-auth-telephony-2.0.xsd'/>
+                <File Id='a_c_ip2.0.xsd' Name='saml-schema-authn-context-ip-2.0.xsd'/>
+                <File Id='a_c_ippword2.0.xsd' Name='saml-schema-authn-context-ippword-2.0.xsd'/>
+                <File Id='a_c_kerberos2.0.xsd' Name='saml-schema-authn-context-kerberos-2.0.xsd'/>
+                <File Id='a_c_mobileonefactorreg2.0.xsd' 
+                      Name='saml-schema-authn-context-mobileonefactor-reg-2.0.xsd'/>
+                <File Id='a_c_mobileonefactorunreg2.0.xsd' 
+                      Name='saml-schema-authn-context-mobileonefactor-unreg-2.0.xsd'/>
+                <File Id='a_c_mobiletwofactorreg2.0.xsd' 
+                      Name='saml-schema-authn-context-mobiletwofactor-reg-2.0.xsd'/>
+                <File Id='a_c_mobiletwofactorunreg2.0.xsd' 
+                      Name='saml-schema-authn-context-mobiletwofactor-unreg-2.0.xsd'/>
+                <File Id='a_c_nomadtelephony2.0.xsd' 
+                      Name='saml-schema-authn-context-nomad-telephony-2.0.xsd' KeyPath='yes' />
+                <File Id='a_c_personaltelephony2.0.xsd' 
+                      Name='saml-schema-authn-context-personal-telephony-2.0.xsd'/>
+                <File Id='a_c_pgp2.0.xsd' Name='saml-schema-authn-context-pgp-2.0.xsd'/>
+                <File Id='a_c_ppt2.0.xsd' Name='saml-schema-authn-context-ppt-2.0.xsd'/>
+                <File Id='a_c_pword2.0.xsd' Name='saml-schema-authn-context-pword-2.0.xsd'/>
+                <File Id='a_c_session2.0.xsd' Name='saml-schema-authn-context-session-2.0.xsd'/>
+                <File Id='a_c_smartcard2.0.xsd' Name='saml-schema-authn-context-smartcard-2.0.xsd'/>
+                <File Id='a_c_smartcardpki2.0.xsd' Name='saml-schema-authn-context-smartcardpki-2.0.xsd'/>
+                <File Id='a_c_softwarepki2.0.xsd' Name='saml-schema-authn-context-softwarepki-2.0.xsd'/>
+                <File Id='a_c_spki2.0.xsd' Name='saml-schema-authn-context-spki-2.0.xsd'/>
+                <File Id='a_c_srp2.0.xsd' Name='saml-schema-authn-context-srp-2.0.xsd'/>
+                <File Id='a_c_sslcert2.0.xsd' Name='saml-schema-authn-context-sslcert-2.0.xsd'/>
+                <File Id='a_c_telephony2.0.xsd' Name='saml-schema-authn-context-telephony-2.0.xsd'/>
+                <File Id='a_c_timesync2.0.xsd' Name='saml-schema-authn-context-timesync-2.0.xsd'/>
+                <File Id='a_c_types2.0.xsd' Name='saml-schema-authn-context-types-2.0.xsd'/>
+                <File Id='a_c_x5092.0.xsd' Name='saml-schema-authn-context-x509-2.0.xsd'/>
+                <File Id='a_c_xmldsig2.0.xsd' Name='saml-schema-authn-context-xmldsig-2.0.xsd'/>
 
-        <File Name='saml-schema-assertion-2.0.xsd'/>
-        <File Name='saml-schema-authn-context-2.0.xsd'/>
-        <File Id='a_c_auth_telephony2.0.xsd' Name='saml-schema-authn-context-auth-telephony-2.0.xsd'/>
-        <File Id='a_c_ip2.0.xsd' Name='saml-schema-authn-context-ip-2.0.xsd'/>
-        <File Id='a_c_ippword2.0.xsd' Name='saml-schema-authn-context-ippword-2.0.xsd'/>
-        <File Id='a_c_kerberos2.0.xsd' Name='saml-schema-authn-context-kerberos-2.0.xsd'/>
-        <File Id='a_c_mobileonefactorreg2.0.xsd' Name='saml-schema-authn-context-mobileonefactor-reg-2.0.xsd'/>
-        <File Id='a_c_mobileonefactorunreg2.0.xsd' Name='saml-schema-authn-context-mobileonefactor-unreg-2.0.xsd'/>
-        <File Id='a_c_mobiletwofactorreg2.0.xsd' Name='saml-schema-authn-context-mobiletwofactor-reg-2.0.xsd'/>
-        <File Id='a_c_mobiletwofactorunreg2.0.xsd' Name='saml-schema-authn-context-mobiletwofactor-unreg-2.0.xsd'/>
-        <File Id='a_c_nomadtelephony2.0.xsd' Name='saml-schema-authn-context-nomad-telephony-2.0.xsd' KeyPath='yes' />
-        <File Id='a_c_personaltelephony2.0.xsd' Name='saml-schema-authn-context-personal-telephony-2.0.xsd'/>
-        <File Id='a_c_pgp2.0.xsd' Name='saml-schema-authn-context-pgp-2.0.xsd'/>
-        <File Id='a_c_ppt2.0.xsd' Name='saml-schema-authn-context-ppt-2.0.xsd'/>
-        <File Id='a_c_pword2.0.xsd' Name='saml-schema-authn-context-pword-2.0.xsd'/>
-        <File Id='a_c_session2.0.xsd' Name='saml-schema-authn-context-session-2.0.xsd'/>
-        <File Id='a_c_smartcard2.0.xsd' Name='saml-schema-authn-context-smartcard-2.0.xsd'/>
-        <File Id='a_c_smartcardpki2.0.xsd' Name='saml-schema-authn-context-smartcardpki-2.0.xsd'/>
-        <File Id='a_c_softwarepki2.0.xsd' Name='saml-schema-authn-context-softwarepki-2.0.xsd'/>
-        <File Id='a_c_spki2.0.xsd' Name='saml-schema-authn-context-spki-2.0.xsd'/>
-        <File Id='a_c_srp2.0.xsd' Name='saml-schema-authn-context-srp-2.0.xsd'/>
-        <File Id='a_c_sslcert2.0.xsd' Name='saml-schema-authn-context-sslcert-2.0.xsd'/>
-        <File Id='a_c_telephony2.0.xsd' Name='saml-schema-authn-context-telephony-2.0.xsd'/>
-        <File Id='a_c_timesync2.0.xsd' Name='saml-schema-authn-context-timesync-2.0.xsd'/>
-        <File Id='a_c_types2.0.xsd' Name='saml-schema-authn-context-types-2.0.xsd'/>
-        <File Id='a_c_x5092.0.xsd' Name='saml-schema-authn-context-x509-2.0.xsd'/>
-        <File Id='a_c_xmldsig2.0.xsd' Name='saml-schema-authn-context-xmldsig-2.0.xsd'/>
+                <File Name='saml-schema-dce-2.0.xsd'/>
+                <File Name='saml-schema-ecp-2.0.xsd'/>
+                <File Name='saml-schema-metadata-2.0.xsd'/>
+                <File Name='saml-schema-protocol-2.0.xsd'/>
+                <File Name='saml-schema-x500-2.0.xsd'/>
+                <File Name='saml-schema-xacml-2.0.xsd'/>
 
-        <File Name='saml-schema-dce-2.0.xsd'/>
-        <File Name='saml-schema-ecp-2.0.xsd'/>
-        <File Name='saml-schema-metadata-2.0.xsd'/>
-        <File Name='saml-schema-protocol-2.0.xsd'/>
-        <File Name='saml-schema-x500-2.0.xsd'/>
-        <File Name='saml-schema-xacml-2.0.xsd'/>
-
-        <File Name='sstc-metadata-attr.xsd'/>
-        <File Name='sstc-request-initiation.xsd'/>
-        <File Name='sstc-saml1x-metadata.xsd'/>
-        <File Name='sstc-saml-attribute-ext.xsd'/>
-        <File Name='sstc-saml-delegation.xsd'/>
-        <File Name='sstc-saml-idp-discovery.xsd' />
-        <File Id='metadata_algsupportv1.0' Name='sstc-saml-metadata-algsupport-v1.0.xsd'/>
-        <File Name='sstc-saml-metadata-ext-query.xsd'/>
-        <File Name='sstc-saml-metadata-ui-v1.0.xsd'/>
-        <File Id='protoco_ext_thirdpaty.xsd' Name='sstc-saml-protocol-ext-thirdparty.xsd'/>
-      </Component>
-    </DirectoryRef>
+                <File Name='sstc-metadata-attr.xsd'/>
+                <File Name='sstc-request-initiation.xsd'/>
+                <File Name='sstc-saml1x-metadata.xsd'/>
+                <File Name='sstc-saml-attribute-ext.xsd'/>
+                <File Name='sstc-saml-delegation.xsd'/>
+                <File Name='sstc-saml-idp-discovery.xsd' />
+                <File Id='metadata_algsupportv1.0' Name='sstc-saml-metadata-algsupport-v1.0.xsd'/>
+                <File Name='sstc-saml-metadata-ext-query.xsd'/>
+                <File Name='sstc-saml-metadata-ui-v1.0.xsd'/>
+                <File Id='protoco_ext_thirdpaty.xsd' Name='sstc-saml-protocol-ext-thirdparty.xsd'/>
+              </Component>
+            </Directory><!--common_doc-->
+          </Directory><!--common_sp-->
+        </Directory><!--common_shibboleth-->
+      </Directory><!--CommonAppDataFolder-->
+    </DirectoryRef><!--TargetDir-->
   </Fragment>
 </Wix>
diff --git a/msi/WiX/MergeModules/OpenSAML-x64.wxs b/msi/WiX/MergeModules/OpenSAML-x64.wxs
new file mode 100644
index 0000000..d3a5d7d
--- /dev/null
+++ b/msi/WiX/MergeModules/OpenSAML-x64.wxs
@@ -0,0 +1,61 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?define BuildDirectory='G:\Downloads\shib\' ?>
+<?define OpenSAMLVersion='2.4.3' ?> 
+<?define OpenSAMLFileVersion='2_4' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='OpenSAMLMergeModule_x64' Language='1033' Version='$(var.OpenSAMLVersion)'>
+    <Package Id='{C4A8AAF1-D263-4361-9695-CE0F56B5D3C6}' Description='Merge Module for OpenSAML (x64)'
+             Comments='This module is built by the Shibboleth Consortium. Includes DDLs SAMLSign and Schema'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>
+
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <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-opensaml\x64\Release\' >
+              <Component Id='saml2_0.dll' Guid='{9EE0A8D1-A6DC-4E2A-904F-BBEF70A0D67B}' Win64='yes'>
+                <File KeyPath='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' />
+              </Component>
+              <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\x64\Debug\'>
+                <Component Id='saml2_0D.dll' Guid='{00836378-7FB9-4A09-AF49-3AA33DEF9BC6}' Win64='yes'>
+                  <File KeyPath='yes' Name='saml$(var.OpenSAMLFileVersion)D.dll' />
+                </Component>
+                <Component Id='samlsign.exe_Debug' Guid='{A6588914-93E1-4FAF-B237-39C0240EECB1}' Win64='yes'>
+                  <File Id='samlsign.exe_Debug' KeyPath='yes' Name='samlsign.exe' />
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+          </Directory><!-- shibboleth_SP -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+    <ComponentRef Id='schema_assertion_01'/>
+    <ComponentRef Id='schema_assertion_1_1'/>
+    <ComponentRef Id='schema_protocol_01'/>
+    <ComponentRef Id='schema_protocol_1_1'/>
+    <ComponentRef Id='samlschema' />
+  </Module>
+</Wix>
+
+    
diff --git a/msi/WiX/MergeModules/OpenSAML-x64.wxs~ b/msi/WiX/MergeModules/OpenSAML-x64.wxs~
new file mode 100644
index 0000000..6bf80dd
--- /dev/null
+++ b/msi/WiX/MergeModules/OpenSAML-x64.wxs~
@@ -0,0 +1,74 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?define BuildDirectory='G:\Downloads\shib\' ?>
+<?define OpenSAMLVersion='2.4.3' ?> 
+<?define OpenSAMLFileVersion='2_4' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='OpenSAMLMergeModule_x86' Language='1033' Version='$(var.OpenSAMLVersion)'>
+    <Package Id='{D6367F80-6B31-4554-ABE4-53404DD46F35}' Description='Merge Module for OpenSAML'
+             Comments='This module is built by the Shibboleth Consortium. Includes DDLs SAMLSign and Schema'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>
+
+    <!-- For now just install this where it is put we expect to go into lib and lib\debug below.  
+         At a a later date, we may chose to make this a placed module  -->
+
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
+        <Directory Id='shibboleth' Name='Shibboleth'>
+          <Directory Id='shibboleth_SP' Name='SP'>
+            <Directory Id='lib' Name='lib'>
+
+              <Component Id='saml2_0.dll' Guid='{B52F8C71-2042-4CDF-A250-BD773985A2AB}'>
+                <File KeyPath='yes'
+                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Release\saml$(var.OpenSAMLFileVersion).dll' />
+              </Component>
+              <Component Id='samlsign.exe' Guid='{3DC7A431-9623-4283-BA07-444DB1C1F864}'>
+                <File KeyPath='yes'
+                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Release\samlsign.exe' />
+              </Component>
+              <Directory Id='lib_debug' Name='debug'>
+                <Component Id='saml2_0D.dll' Guid='{7B934257-5F7F-428E-930E-A793A11573D7}'>
+                  <File KeyPath='yes'
+                        Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Debug\saml$(var.OpenSAMLFileVersion)D.dll' />
+                </Component>
+                <Component Id='samlsign.exe_Debug' Guid='{EFCAEBC5-242F-416C-8F87-B7DD49C1AE29}'>
+                  <File Id='samlsign.exe_Debug' KeyPath='yes'
+                        Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Debug\samlsign.exe' />
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+            <Directory Id='share' Name='share'>
+              <Directory Id='share_xml' Name='xml'>
+                <Directory Id='share_xml_opensaml' Name='opensaml' />
+              </Directory><!-- xml-->
+            </Directory><!-- share -->
+          </Directory><!-- shibboleth_SP -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+    <ComponentRef Id='schema_assertion_01'/>
+    <ComponentRef Id='schema_assertion_1_1'/>
+    <ComponentRef Id='schema_protocol_01'/>
+    <ComponentRef Id='schema_protocol_1_1'/>
+    <ComponentRef Id='samlschema' />
+  </Module>
+</Wix>
+
+    
diff --git a/msi/WiX/MergeModules/OpenSAML-x86.wxs b/msi/WiX/MergeModules/OpenSAML-x86.wxs
index 6bf80dd..2b21427 100644
--- a/msi/WiX/MergeModules/OpenSAML-x86.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-x86.wxs
@@ -22,43 +22,30 @@
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Module Id='OpenSAMLMergeModule_x86' Language='1033' Version='$(var.OpenSAMLVersion)'>
-    <Package Id='{D6367F80-6B31-4554-ABE4-53404DD46F35}' Description='Merge Module for OpenSAML'
+    <Package Id='{D6367F80-6B31-4554-ABE4-53404DD46F35}' Description='Merge Module for OpenSAML (x86)'
              Comments='This module is built by the Shibboleth Consortium. Includes DDLs SAMLSign and Schema'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>
-
-    <!-- For now just install this where it is put we expect to go into lib and lib\debug below.  
-         At a a later date, we may chose to make this a placed module  -->
+             Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x86'/>
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
         <Directory Id='shibboleth' Name='Shibboleth'>
           <Directory Id='shibboleth_SP' Name='SP'>
-            <Directory Id='lib' Name='lib'>
-
+            <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Release\'>
               <Component Id='saml2_0.dll' Guid='{B52F8C71-2042-4CDF-A250-BD773985A2AB}'>
-                <File KeyPath='yes'
-                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Release\saml$(var.OpenSAMLFileVersion).dll' />
+                <File KeyPath='yes' Name='saml$(var.OpenSAMLFileVersion).dll' />
               </Component>
               <Component Id='samlsign.exe' Guid='{3DC7A431-9623-4283-BA07-444DB1C1F864}'>
-                <File KeyPath='yes'
-                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Release\samlsign.exe' />
+                <File KeyPath='yes' Name='samlsign.exe' />
               </Component>
-              <Directory Id='lib_debug' Name='debug'>
+              <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Debug'>
                 <Component Id='saml2_0D.dll' Guid='{7B934257-5F7F-428E-930E-A793A11573D7}'>
-                  <File KeyPath='yes'
-                        Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Debug\saml$(var.OpenSAMLFileVersion)D.dll' />
+                  <File KeyPath='yes' Name='saml$(var.OpenSAMLFileVersion)D.dll' />
                 </Component>
                 <Component Id='samlsign.exe_Debug' Guid='{EFCAEBC5-242F-416C-8F87-B7DD49C1AE29}'>
-                  <File Id='samlsign.exe_Debug' KeyPath='yes'
-                        Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Debug\samlsign.exe' />
+                  <File Id='samlsign.exe_Debug' KeyPath='yes' Name='samlsign.exe' />
                 </Component>
               </Directory><!-- lib_debug-->
             </Directory><!-- lib -->
-            <Directory Id='share' Name='share'>
-              <Directory Id='share_xml' Name='xml'>
-                <Directory Id='share_xml_opensaml' Name='opensaml' />
-              </Directory><!-- xml-->
-            </Directory><!-- share -->
           </Directory><!-- shibboleth_SP -->
         </Directory><!-- shibboleth -->
       </Directory><!-- ProgramFilesFolder -->
diff --git a/msi/WiX/MergeModules/OpenSSL-x64-files.wxs~ b/msi/WiX/MergeModules/OpenSSL-x64-files.wxs~
new file mode 100644
index 0000000..d826f73
--- /dev/null
+++ b/msi/WiX/MergeModules/OpenSSL-x64-files.wxs~
@@ -0,0 +1,78 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?define BuildDirectory='G:\Downloads\shib\' ?>
+<?define OpenSSLVersion='1.0.0.10' ?><!-- 1.0.0a -->
+<?define OpenSSLDirVersion='1.0.0a' ?>
+<?define OpenSSLFileVersion='1_0_0' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='OpenSSLMergeModule_x86' Language='1033' Version='$(var.OpenSSLVersion)'>
+    <Package Id='11FD68EE-607E-4755-98AA-1C7EE5E03652' Description='Merge Module for OpenSSL'
+             Comments='This module is built by the Shibboleth Consortium. Includes libeay32 and ssleay32.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>
+
+    <!-- For now just install this where it is put we expect to go into lib and lib\debug below.  
+         At a a later date, we may chose to make this a placed module  -->
+
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>
+        <Directory Id='shibboleth' Name='Shibboleth'>
+          <Directory Id='shibboleth_sp' Name='SP'>
+            <Directory Id='lib' Name='lib'>
+              <Component Id='libeay32.dll' Guid='{F1C1CE98-D583-44A3-B30E-8F1998C833EC}' Win64='Yes'>
+                <File KeyPath='yes'
+                      Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll\libeay32_$(var.OpenSSLFileVersion).dll' />
+              </Component>
+              <Component Id='ssleay32.dll' Guid='{649A8C33-1F00-40BD-BBA4-0D8FD7C258CD'} Win64='Yes'>
+                <File KeyPath='yes'
+                      Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll\ssleay32_$(var.OpenSSLFileVersion).dll' />
+              </Component>
+              <Component Id='openssl.exe' Guid='{AF6DBF01-02E0-4CA4-9466-2E95EAC1200E}' Win64='Yes'>
+                <File KeyPath='yes'
+                      Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll\openssl.exe' />
+              </Component>
+              <Directory Id='lib_debug' Name='debug'>
+                <Component Id='libeay32.dll_debug' Guid='{77010CF4-1367-4E42-86EA-C29D72EDAEC5}' Win64='Yes'>
+                  <File Id='libeay32.dll_debug' KeyPath='yes'
+                        Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll.dbg\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'
+                        Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll.dbg\ssleay32_$(var.OpenSSLFileVersion)D.dll' />
+                </Component>
+                <Component Id='openssl.exe_debug' Guid='{3555958C-C30D-4829-BC17-936D2EEC3EA4}' Win64='Yes'>
+                  <File Id='openssl.exe_debug'
+                        Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll.dbg\openssl.exe' />
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+            <Directory Id='doc' Name='doc'>
+              <Directory Id='doc_shibboleth' Name='shibboleth'>
+                <Component Id='OPENSSL.LICENSE' Guid='{10B77A21-E554-47F2-99F0-7171304FE899}' Win64='Yes'>
+                  <File KeyPath='yes' 
+                        Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\OPENSSL.LICENSE' />
+                </Component>
+              </Directory><!-- doc_shibboleth-->
+            </Directory><!-- doc -->
+          </Directory><!-- shibboleth_sp -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix>    
diff --git a/msi/WiX/MergeModules/OpenSSL-x64.wxs b/msi/WiX/MergeModules/OpenSSL-x64.wxs
new file mode 100644
index 0000000..4a32c4f
--- /dev/null
+++ b/msi/WiX/MergeModules/OpenSSL-x64.wxs
@@ -0,0 +1,66 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?define BuildDirectory='G:\Downloads\shib\' ?>
+<?define OpenSSLVersion='1.0.0.10' ?><!-- 1.0.0a -->
+<?define OpenSSLDirVersion='1.0.0a' ?>
+<?define OpenSSLFileVersion='1_0_0' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='OpenSSLMergeModule_x64' Language='1033' Version='$(var.OpenSSLVersion)'>
+    <Package Id='{EEB21422-347C-4AFA-A347-DCA0E5D61572}' Description='Merge Module for OpenSSL (x64)'
+             Comments='This module is built by the Shibboleth Consortium. Includes libeay32 and ssleay32.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x64'/>
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFiles64Folder' >
+        <Directory Id='shibboleth64' Name='Shibboleth'>
+          <Directory Id='shibboleth_sp64' Name='SP'>
+            <Directory Id='lib64' Name='lib' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll\' >
+              <Component Id='libeay64.dll' Guid='{49ED7AFD-EB3D-4296-84BC-E40C0E40DE5D}' Win64='yes'>
+                <File KeyPath='yes' Name='libeay32_$(var.OpenSSLFileVersion).dll' />
+              </Component>
+              <Component Id='ssleay64.dll' Guid='{649A8C33-1F00-40BD-BBA4-0D8FD7C258CD}' Win64='yes'>
+                <File KeyPath='yes' Name='ssleay32_$(var.OpenSSLFileVersion).dll' />
+              </Component>
+              <Component Id='openssl64.exe' Guid='{AF6DBF01-02E0-4CA4-9466-2E95EAC1200E}' Win64='yes'>
+                <File KeyPath='yes' Name='openssl.exe' />
+              </Component>
+              <Directory Id='lib_debug64' Name='debug' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll.dbg\'>
+                <Component Id='libeay64.dll_debug' Guid='{77010CF4-1367-4E42-86EA-C29D72EDAEC5}' Win64='yes'>
+                  <File Id='libeay64.dll_debug' KeyPath='yes' Name='libeay32_$(var.OpenSSLFileVersion)D.dll' />
+                </Component>
+                <Component Id='ssleay64.dll_debug' Guid='{52C30BD0-3769-4021-85F7-4AE539DCED41}' Win64='yes'>
+                  <File Id='ssleay64.dll_debug' KeyPath='yes' Name='ssleay32_$(var.OpenSSLFileVersion)D.dll' />
+                </Component>
+                <Component Id='openssl64.exe_debug' Guid='{3555958C-C30D-4829-BC17-936D2EEC3EA4}' Win64='yes'>
+                  <File Id='openssl64.exe_debug' Name='openssl.exe' />
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+            <Directory Id='doc64' Name='doc'>
+              <Component Id='OPENSSL.LICENSE_64' Guid='{10B77A21-E554-47F2-99F0-7171304FE899}' Win64='yes'>
+                <File KeyPath='yes' Id='OPENSSL.LICENSE_64'
+                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\OPENSSL.LICENSE' />
+              </Component>
+            </Directory><!-- doc -->
+          </Directory><!-- shibboleth_sp -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory>
+  </Module>
+</Wix>    
diff --git a/msi/WiX/MergeModules/OpenSSL-x64.wxs~ b/msi/WiX/MergeModules/OpenSSL-x64.wxs~
new file mode 100644
index 0000000..d826f73
--- /dev/null
+++ b/msi/WiX/MergeModules/OpenSSL-x64.wxs~
@@ -0,0 +1,78 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?define BuildDirectory='G:\Downloads\shib\' ?>
+<?define OpenSSLVersion='1.0.0.10' ?><!-- 1.0.0a -->
+<?define OpenSSLDirVersion='1.0.0a' ?>
+<?define OpenSSLFileVersion='1_0_0' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='OpenSSLMergeModule_x86' Language='1033' Version='$(var.OpenSSLVersion)'>
+    <Package Id='11FD68EE-607E-4755-98AA-1C7EE5E03652' Description='Merge Module for OpenSSL'
+             Comments='This module is built by the Shibboleth Consortium. Includes libeay32 and ssleay32.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>
+
+    <!-- For now just install this where it is put we expect to go into lib and lib\debug below.  
+         At a a later date, we may chose to make this a placed module  -->
+
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>
+        <Directory Id='shibboleth' Name='Shibboleth'>
+          <Directory Id='shibboleth_sp' Name='SP'>
+            <Directory Id='lib' Name='lib'>
+              <Component Id='libeay32.dll' Guid='{F1C1CE98-D583-44A3-B30E-8F1998C833EC}' Win64='Yes'>
+                <File KeyPath='yes'
+                      Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll\libeay32_$(var.OpenSSLFileVersion).dll' />
+              </Component>
+              <Component Id='ssleay32.dll' Guid='{649A8C33-1F00-40BD-BBA4-0D8FD7C258CD'} Win64='Yes'>
+                <File KeyPath='yes'
+                      Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll\ssleay32_$(var.OpenSSLFileVersion).dll' />
+              </Component>
+              <Component Id='openssl.exe' Guid='{AF6DBF01-02E0-4CA4-9466-2E95EAC1200E}' Win64='Yes'>
+                <File KeyPath='yes'
+                      Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll\openssl.exe' />
+              </Component>
+              <Directory Id='lib_debug' Name='debug'>
+                <Component Id='libeay32.dll_debug' Guid='{77010CF4-1367-4E42-86EA-C29D72EDAEC5}' Win64='Yes'>
+                  <File Id='libeay32.dll_debug' KeyPath='yes'
+                        Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll.dbg\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'
+                        Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll.dbg\ssleay32_$(var.OpenSSLFileVersion)D.dll' />
+                </Component>
+                <Component Id='openssl.exe_debug' Guid='{3555958C-C30D-4829-BC17-936D2EEC3EA4}' Win64='Yes'>
+                  <File Id='openssl.exe_debug'
+                        Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll.dbg\openssl.exe' />
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+            <Directory Id='doc' Name='doc'>
+              <Directory Id='doc_shibboleth' Name='shibboleth'>
+                <Component Id='OPENSSL.LICENSE' Guid='{10B77A21-E554-47F2-99F0-7171304FE899}' Win64='Yes'>
+                  <File KeyPath='yes' 
+                        Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\OPENSSL.LICENSE' />
+                </Component>
+              </Directory><!-- doc_shibboleth-->
+            </Directory><!-- doc -->
+          </Directory><!-- shibboleth_sp -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix>    
diff --git a/msi/WiX/MergeModules/OpenSSL-x86-files.wxs~ b/msi/WiX/MergeModules/OpenSSL-x86-files.wxs~
new file mode 100644
index 0000000..6e2a674
--- /dev/null
+++ b/msi/WiX/MergeModules/OpenSSL-x86-files.wxs~
@@ -0,0 +1,78 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?define BuildDirectory='G:\Downloads\shib\' ?>
+<?define OpenSSLVersion='1.0.0.10' ?><!-- 1.0.0a -->
+<?define OpenSSLDirVersion='1.0.0a' ?>
+<?define OpenSSLFileVersion='1_0_0' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='OpenSSLMergeModule_x86' Language='1033' Version='$(var.OpenSSLVersion)'>
+    <Package Id='11FD68EE-607E-4755-98AA-1C7EE5E03652' Description='Merge Module for OpenSSL'
+             Comments='This module is built by the Shibboleth Consortium. Includes libeay32 and ssleay32.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>
+
+    <!-- For now just install this where it is put we expect to go into lib and lib\debug below.  
+         At a a later date, we may chose to make this a placed module  -->
+
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
+        <Directory Id='shibboleth' Name='Shibboleth'>
+          <Directory Id='shibboleth_sp' Name='SP'>
+            <Directory Id='lib' Name='lib'>
+              <Component Id='libeay32.dll' Guid='{38378D46-4CF2-4DE5-A30D-79F92AD6DD06}'>
+                <File KeyPath='yes'
+                      Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll\libeay32_$(var.OpenSSLFileVersion).dll' />
+              </Component>
+              <Component Id='ssleay32.dll' Guid='{9C1CAE5E-F8E9-4EBA-961B-1DD149097702}'>
+                <File KeyPath='yes'
+                      Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll\ssleay32_$(var.OpenSSLFileVersion).dll' />
+              </Component>
+              <Component Id='openssl.exe' Guid='{886F0254-AD10-45C6-A723-37C7FA466651}'>
+                <File KeyPath='yes'
+                      Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll\openssl.exe' />
+              </Component>
+              <Directory Id='lib_debug' Name='debug'>
+                <Component Id='libeay32.dll_debug' Guid='{86C4099A-1E75-4676-8F6D-BF5748F657B6}'>
+                  <File Id='libeay32.dll_debug' KeyPath='yes'
+                        Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll.dbg\libeay32_$(var.OpenSSLFileVersion)D.dll' />
+                </Component>
+                <Component Id='ssleay32.dll_debug' Guid='{2097A37D-650E-45F4-96C0-94C748DEA49C}'>
+                  <File Id='ssleay32.dll_debug' KeyPath='yes'
+                        Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll.dbg\ssleay32_$(var.OpenSSLFileVersion)D.dll' />
+                </Component>
+                <Component Id='openssl.exe_debug' Guid='{D47E4692-F648-4800-BE4A-9D84DAD5DEEA}'>
+                  <File Id='openssl.exe_debug'
+                        Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll.dbg\openssl.exe' />
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+            <Directory Id='doc' Name='doc'>
+              <Directory Id='doc_shibboleth' Name='shibboleth'>
+                <Component Id='OPENSSL.LICENSE' Guid='{CEC1CC66-6D48-475A-8C99-B687B0B901AA}'>
+                  <File KeyPath='yes' 
+                        Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\OPENSSL.LICENSE' />
+                </Component>
+              </Directory><!-- doc_shibboleth-->
+            </Directory><!-- doc -->
+          </Directory><!-- shibboleth_sp -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix>    
diff --git a/msi/WiX/MergeModules/OpenSSL-x86.wxs b/msi/WiX/MergeModules/OpenSSL-x86.wxs
index 6e2a674..09e2e1a 100644
--- a/msi/WiX/MergeModules/OpenSSL-x86.wxs
+++ b/msi/WiX/MergeModules/OpenSSL-x86.wxs
@@ -23,52 +23,40 @@
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Module Id='OpenSSLMergeModule_x86' Language='1033' Version='$(var.OpenSSLVersion)'>
-    <Package Id='11FD68EE-607E-4755-98AA-1C7EE5E03652' Description='Merge Module for OpenSSL'
+    <Package Id='11FD68EE-607E-4755-98AA-1C7EE5E03652' Description='Merge Module for OpenSSL (x86)'
              Comments='This module is built by the Shibboleth Consortium. Includes libeay32 and ssleay32.'
              Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>
-
-    <!-- For now just install this where it is put we expect to go into lib and lib\debug below.  
-         At a a later date, we may chose to make this a placed module  -->
-
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
         <Directory Id='shibboleth' Name='Shibboleth'>
           <Directory Id='shibboleth_sp' Name='SP'>
-            <Directory Id='lib' Name='lib'>
+            <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'
-                      Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll\libeay32_$(var.OpenSSLFileVersion).dll' />
+                <File KeyPath='yes' Name='libeay32_$(var.OpenSSLFileVersion).dll' />
               </Component>
               <Component Id='ssleay32.dll' Guid='{9C1CAE5E-F8E9-4EBA-961B-1DD149097702}'>
-                <File KeyPath='yes'
-                      Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll\ssleay32_$(var.OpenSSLFileVersion).dll' />
+                <File KeyPath='yes' Name='ssleay32_$(var.OpenSSLFileVersion).dll' />
               </Component>
               <Component Id='openssl.exe' Guid='{886F0254-AD10-45C6-A723-37C7FA466651}'>
-                <File KeyPath='yes'
-                      Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll\openssl.exe' />
+                <File KeyPath='yes' Name='openssl.exe' />
               </Component>
-              <Directory Id='lib_debug' Name='debug'>
+              <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'
-                        Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll.dbg\libeay32_$(var.OpenSSLFileVersion)D.dll' />
+                  <File Id='libeay32.dll_debug' KeyPath='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'
-                        Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll.dbg\ssleay32_$(var.OpenSSLFileVersion)D.dll' />
+                  <File Id='ssleay32.dll_debug' KeyPath='yes' Name='ssleay32_$(var.OpenSSLFileVersion)D.dll' />
                 </Component>
                 <Component Id='openssl.exe_debug' Guid='{D47E4692-F648-4800-BE4A-9D84DAD5DEEA}'>
-                  <File Id='openssl.exe_debug'
-                        Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll.dbg\openssl.exe' />
+                  <File Id='openssl.exe_debug' Name='openssl.exe' />
                 </Component>
               </Directory><!-- lib_debug-->
             </Directory><!-- lib -->
             <Directory Id='doc' Name='doc'>
-              <Directory Id='doc_shibboleth' Name='shibboleth'>
-                <Component Id='OPENSSL.LICENSE' Guid='{CEC1CC66-6D48-475A-8C99-B687B0B901AA}'>
-                  <File KeyPath='yes' 
-                        Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\OPENSSL.LICENSE' />
-                </Component>
-              </Directory><!-- doc_shibboleth-->
+              <Component Id='OPENSSL.LICENSE' Guid='{CEC1CC66-6D48-475A-8C99-B687B0B901AA}'>
+                <File KeyPath='yes' 
+                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\OPENSSL.LICENSE' />
+              </Component>
             </Directory><!-- doc -->
           </Directory><!-- shibboleth_sp -->
         </Directory><!-- shibboleth -->
diff --git a/msi/WiX/MergeModules/Shibboleth-x64.wxs b/msi/WiX/MergeModules/Shibboleth-x64.wxs
new file mode 100644
index 0000000..31a43a1
--- /dev/null
+++ b/msi/WiX/MergeModules/Shibboleth-x64.wxs
@@ -0,0 +1,67 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?define BuildDirectory='G:\Downloads\shib\' ?>
+<?define ShibbolethSPFileVersion='1_4' ?>
+<?define ShibbolethVersion='1.4.2' ?>
+
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='ShibbolethSPMergeModule_x64' Language='1033' Version='$(var.ShibbolethVersion)'>
+    <Package Id='{DF6FAD40-5EF8-43F2-BBE1-BD42B9E9ACAB}' Description='Merge Module for Shibboleth DLLs (x64)'
+             Comments='This module is built by the Shibboleth Consortium.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>
+
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <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.ShibbolethSPFileVersion).dll' KeyPath='yes' />
+              </Component>
+              <Component Id='shibsp.dll' Guid='{B7DE652A-6853-4389-AD47-5DBB5AC89BDB}' Win64='yes'>
+                <File Name='shibsp$(var.ShibbolethSPFileVersion).dll' KeyPath='yes' />
+              </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.ShibbolethSPFileVersion)D.dll' KeyPath='yes' />
+                </Component>
+                <Component Id='shibspD.dll' Guid='{222ED92E-DD0B-410E-9A90-D1DD1AA878CF}' Win64='yes'>
+                  <File Name='shibsp$(var.ShibbolethSPFileVersion)D.dll' KeyPath='yes' />
+                </Component>
+              </Directory><!-- lib_debug -->
+            </Directory><!-- lib -->
+            <Directory Id='doc' Name='doc' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc'>
+              <Component Id='doc_shibboleth' Guid='{F858AC39-4C24-4255-A86E-4747FE45624E}' Win64='yes'>
+                <File Name='CREDITS.txt' KeyPath='yes'/>
+                <File Name='LICENSE.txt' />
+                <File Name='NOTICE.txt' />
+                <File Name='README.txt'/>
+                <File Name='RELEASE.txt' />
+              </Component>
+            </Directory><!-- doc -->
+          </Directory><!-- shibboleth_sp -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix>
+
+    
diff --git a/msi/WiX/MergeModules/Shibboleth-x64.wxs~ b/msi/WiX/MergeModules/Shibboleth-x64.wxs~
new file mode 100644
index 0000000..a4b58d6
--- /dev/null
+++ b/msi/WiX/MergeModules/Shibboleth-x64.wxs~
@@ -0,0 +1,66 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?define BuildDirectory='G:\Downloads\shib\' ?>
+<?define ShibbolethSPFileVersion='1_4' ?>
+<?define ShibbolethVersion='1.4.2' ?>
+
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='ShibbolethSPMergeModule_x86' Language='1033' Version='$(var.ShibbolethVersion)'>
+    <Package Id='{AD8C7CB1-94D5-4C8E-88D0-040F817E1802}' Description='Merge Module for Shibboleth DLLs'
+             Comments='This module is built by the Shibboleth Consortium.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>
+
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <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.ShibbolethSPFileVersion).dll" KeyPath="yes" />
+              </Component>
+              <Component Id="shibsp.dll" Guid="{9DE384BF-C286-4A72-AED9-AA34384005C0}">
+                <File Name="shibsp$(var.ShibbolethSPFileVersion).dll" KeyPath="yes" />
+              </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.ShibbolethSPFileVersion)D.dll" KeyPath="yes" />
+                </Component>
+                <Component Id="shibspD.dll" Guid="{4196D799-1162-4D62-9F7A-1F59E90F19F1}">
+                  <File Name="shibsp$(var.ShibbolethSPFileVersion)D.dll" KeyPath="yes" />
+                </Component>
+              </Directory><!-- lib_debug -->
+            </Directory><!-- lib -->
+            <Directory Id='doc' Name='doc'>
+                <Component Id='doc_shibboleth' Guid='{EEA99655-7A42-4D5D-AB64-AA7DD5A99409}'>
+                  <File Name='CREDITS.txt' KeyPath='yes'/>
+                  <File Name='LICENSE.txt' />
+                  <File Name='NOTICE.txt' />
+                  <File Name='README.txt'/>
+                  <File Name='RELEASE.txt' />
+                </Component>
+            </Directory><!-- doc -->          </Directory><!-- shibboleth_sp -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix>
+
+    
diff --git a/msi/WiX/MergeModules/Shibboleth-x86.wxs b/msi/WiX/MergeModules/Shibboleth-x86.wxs
index 0e4c661..16246a5 100644
--- a/msi/WiX/MergeModules/Shibboleth-x86.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-x86.wxs
@@ -22,9 +22,9 @@
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Module Id='ShibbolethSPMergeModule_x86' Language='1033' Version='$(var.ShibbolethVersion)'>
-    <Package Id='{AD8C7CB1-94D5-4C8E-88D0-040F817E1802}' Description='Merge Module for Shibboleth DLLs'
+    <Package Id='{AD8C7CB1-94D5-4C8E-88D0-040F817E1802}' Description='Merge Module for Shibboleth DLLs (x86)'
              Comments='This module is built by the Shibboleth Consortium.'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>
+             Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x86'/>
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
@@ -32,23 +32,31 @@
           <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.ShibbolethSPFileVersion).dll" KeyPath="yes" />
+              <Component Id='shibsplite.dll' Guid='{10475E33-434D-4805-B983-195092549BED}'>
+                <File Name='shibsp-lite$(var.ShibbolethSPFileVersion).dll' KeyPath='yes' />
               </Component>
-              <Component Id="shibsp.dll" Guid="{9DE384BF-C286-4A72-AED9-AA34384005C0}">
-                <File Name="shibsp$(var.ShibbolethSPFileVersion).dll" KeyPath="yes" />
+              <Component Id='shibsp.dll' Guid='{9DE384BF-C286-4A72-AED9-AA34384005C0}'>
+                <File Name='shibsp$(var.ShibbolethSPFileVersion).dll' KeyPath='yes' />
               </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.ShibbolethSPFileVersion)D.dll" KeyPath="yes" />
+                <Component Id='shibspliteD.dll' Guid='{8E070220-2992-4D45-BF98-459022CD268F}'>
+                  <File Name='shibsp-lite$(var.ShibbolethSPFileVersion)D.dll' KeyPath='yes' />
                 </Component>
-                <Component Id="shibspD.dll" Guid="{4196D799-1162-4D62-9F7A-1F59E90F19F1}">
-                  <File Name="shibsp$(var.ShibbolethSPFileVersion)D.dll" KeyPath="yes" />
+                <Component Id='shibspD.dll' Guid='{4196D799-1162-4D62-9F7A-1F59E90F19F1}'>
+                  <File Name='shibsp$(var.ShibbolethSPFileVersion)D.dll' KeyPath='yes' />
                 </Component>
               </Directory><!-- lib_debug -->
             </Directory><!-- lib -->
-          </Directory><!-- shibboleth_sp -->
+            <Directory Id='doc' Name='doc' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc'>
+              <Component Id='doc_shibboleth' Guid='{EEA99655-7A42-4D5D-AB64-AA7DD5A99409}'>
+                <File Name='CREDITS.txt' KeyPath='yes'/>
+                <File Name='LICENSE.txt' />
+                <File Name='NOTICE.txt' />
+                <File Name='README.txt'/>
+                <File Name='RELEASE.txt' />
+              </Component>
+            </Directory><!-- doc -->          </Directory><!-- shibboleth_sp -->
         </Directory><!-- shibboleth -->
       </Directory><!-- ProgramFilesFolder -->
     </Directory><!-- TARGETDIR -->
diff --git a/msi/WiX/MergeModules/Xerces-x64.wxs b/msi/WiX/MergeModules/Xerces-x64.wxs
new file mode 100644
index 0000000..dd02a5f
--- /dev/null
+++ b/msi/WiX/MergeModules/Xerces-x64.wxs
@@ -0,0 +1,51 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?define BuildDirectory='G:\Downloads\shib\' ?>
+<?define XercesVersion='3.1.1' ?>
+<?define XercesFileVersion='3_1' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='XercesMergeModule_x86' Language='1033' Version='$(var.XercesVersion)'>
+    <Package Id='{72CA15B1-CEB8-4C9B-A5CB-5254759E4B3A}' Description='Merge Module for Xerces (x64)'
+             Comments='This module is built by the Shibboleth Consortium.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <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'
+                      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'
+                        Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86_64-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion)D.dll'/>
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+          </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~
new file mode 100644
index 0000000..a4928d4
--- /dev/null
+++ b/msi/WiX/MergeModules/Xerces-x64.wxs~
@@ -0,0 +1,55 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?define BuildDirectory='G:\Downloads\shib\' ?>
+<?define XercesVersion='3.1.1' ?>
+<?define XercesFileVersion='3_1' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='XercesMergeModule_x86' Language='1033' Version='$(var.XercesVersion)'>
+    <Package Id='{5A32778E-B904-4828-90CD-A317B4F6DF7D}' Description='Merge Module for Xerces'
+             Comments='This module is built by the Shibboleth Consortium.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>
+
+    <!-- For now just install this where it is put we expect to go into lib and lib\debug below.  
+         At a a later date, we may chose to make this a placed module  -->
+
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <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'
+                      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'
+                        Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion)D.dll'/>
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+          </Directory><!-- shibboleth_SP -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix>
+
+    
diff --git a/msi/WiX/MergeModules/Xerces-x86.wxs b/msi/WiX/MergeModules/Xerces-x86.wxs
index a4928d4..0b2a3a6 100644
--- a/msi/WiX/MergeModules/Xerces-x86.wxs
+++ b/msi/WiX/MergeModules/Xerces-x86.wxs
@@ -22,13 +22,9 @@
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Module Id='XercesMergeModule_x86' Language='1033' Version='$(var.XercesVersion)'>
-    <Package Id='{5A32778E-B904-4828-90CD-A317B4F6DF7D}' Description='Merge Module for Xerces'
+    <Package Id='{5A32778E-B904-4828-90CD-A317B4F6DF7D}' Description='Merge Module for Xerces (x86)'
              Comments='This module is built by the Shibboleth Consortium.'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>
-
-    <!-- For now just install this where it is put we expect to go into lib and lib\debug below.  
-         At a a later date, we may chose to make this a placed module  -->
-
+             Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x86'/>
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
         <Directory Id='shibboleth' Name='Shibboleth'>
diff --git a/msi/WiX/MergeModules/XmlSec-x64.wxs b/msi/WiX/MergeModules/XmlSec-x64.wxs
new file mode 100644
index 0000000..e2d7291
--- /dev/null
+++ b/msi/WiX/MergeModules/XmlSec-x64.wxs
@@ -0,0 +1,88 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+     Development, Inc. (UCAID) under one or more contributor license
+     agreements.  See the NOTICE file distributed with this work for
+     additional information regarding copyright ownership. The UCAID
+     licenses this file to You under the Apache License, Version 2.0
+     (the "License"); you may not use this file except in compliance
+     with the License.  You may obtain a copy of the License at
+     
+     http://www.apache.org/licenses/LICENSE-2.0
+     
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+     implied.  See the License for the specific language governing
+     permissions and limitations under the License.  -->
+
+<?define BuildDirectory='G:\Downloads\shib\' ?>
+<?define XmlSecVersion='1.6.0' ?> <!-- 1.0.0a -->
+<?define XmlSecFileVersion='1_6' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='XmlSecmergemodule_x64' Language='1033' Version='$(var.XmlSecVersion)'>
+    <Package Id='{B94AFB16-A52E-4C88-9011-FF0C897ABDE1}' Description='Merge Module for XmlSec (x64)'
+             Comments='This module is built by the Shibboleth Consortium. Includes Several excutables.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>
+        <Directory Id='shibboleth' Name='Shibboleth'>
+          <Directory Id='shibboleth_SP' Name='SP'>
+            <Directory Id='lib' Name='lib' 
+                       FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Release No Xalan'>
+              <!-- GUID taken from 2.4.3 installer -->
+              <Component Id='xsec_1_4_0.dll' Guid='{3EB5B168-1FB1-476D-8E7C-2469D9B55162}' Win64='yes'>
+                <File KeyPath='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'/>
+              </Component>
+              <Component Id='checksig.exe' Guid='{D2145F4D-95FA-4A24-B06C-D37AF36ADDD2}' Win64='yes'>
+                <File KeyPath='yes' Name='checksig.exe'/>
+              </Component>
+              <Component Id='cipher.exe' Guid='{192AEEF7-3AE2-4570-AA30-1A2046646A84}' Win64='yes'>
+                <File KeyPath='yes' Name='cipher.exe'/>
+              </Component>
+              <Component Id='siginf.exe' Guid='{7C15D545-DDB9-4D02-AE9C-4C9E0229FC72}' Win64='yes'>
+                <File KeyPath='yes' Name='siginf.exe'/>
+              </Component>
+              <Component Id='templatesign.exe' Guid='{71B603E6-A54B-4843-A4F8-826AD4CA6A04}' Win64='yes'>
+                <File KeyPath='yes' Name='templatesign.exe'/>
+              </Component>
+              <Component Id='txfmout.exe' Guid='{2D9025EE-D95F-4D3C-B0E7-86D742749D39}' Win64='yes'>
+                <File KeyPath='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='xsec_1_4_0D.dll' Guid='{EC1CCD0D-028D-4C92-846D-88C1C24B66E6}' Win64='yes'>
+                  <File KeyPath='yes' Name='xsec_$(var.XmlSecFileVersion)D.dll'/>
+                </Component>
+                <Component Id='c14n.exe2' Guid='{ED9BB341-C5D2-4234-B720-483D86D340F9}' Win64='yes'>
+                  <File Id='c14n.exe_debug' KeyPath='yes' Name='c14n.exe'/>
+                </Component>
+                <Component Id='checksig.exe6' Guid='{F6618EE1-A5BD-4EC5-9257-E62015DC3BC4}' Win64='yes'>
+                  <File Id='checksig.exe_debug' KeyPath='yes' Name='checksig.exe'/>
+                </Component>
+                <Component Id='cipher.exe4' Guid='{EAB5FF33-9EBD-4C55-8D64-F975E5B11785}' Win64='yes'>
+                  <File Id='cipher.exe_debug' KeyPath='yes' Name='cipher.exe'/>
+                </Component>
+                <Component Id='siginf.exe5' Guid='{1EA9ABB6-2B33-4E4C-9210-B89FCC493E78}' Win64='yes'>
+                  <File Id='siginf.exe_debug' KeyPath='yes' Name='siginf.exe'/>
+                </Component>
+                <Component Id='templatesign.exe3' Guid='{5AE22CDB-625E-4DC7-9586-77C3DD835100}' Win64='yes'>
+                  <File Id='templatesign.exe_debug' KeyPath='yes' Name='templatesign.exe'/>
+                </Component>
+                <Component Id='txfmout.exe1' Guid='{373B4E3D-6643-4884-8D0C-324DEF910230}' Win64='yes'>
+                  <File Id='txfmout.exe_debug' KeyPath='yes' Name='txfmout.exe'/>
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+          </Directory><!-- shibboleth_sp -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix> 
+
+  
diff --git a/msi/WiX/MergeModules/XmlSec-x86.wxs b/msi/WiX/MergeModules/XmlSec-x86.wxs
index d8dfee5..ffe459b 100644
--- a/msi/WiX/MergeModules/XmlSec-x86.wxs
+++ b/msi/WiX/MergeModules/XmlSec-x86.wxs
@@ -22,75 +22,59 @@
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Module Id='XmlSecMergeModule_x86' Language='1033' Version='$(var.XmlSecVersion)'>
-    <Package Id='{D1678DAE-81D9-4756-ABE6-7D1218F0D350}' Description='Merge Module for XmlSec'
+    <Package Id='{D1678DAE-81D9-4756-ABE6-7D1218F0D350}' Description='Merge Module for XmlSec (x64)'
              Comments='This module is built by the Shibboleth Consortium. Includes Several excutables.'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>
-
-    <!-- For now just install this where it is put we expect to go into lib and lib\debug below.  
-         At a a later date, we may chose to make this a placed module  -->
-
+             Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x86'/>
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
         <Directory Id='shibboleth' Name='Shibboleth'>
           <Directory Id='shibboleth_SP' Name='SP'>
-            <Directory Id='lib' Name='lib'>
+            <Directory Id='lib' Name='lib' 
+                       FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Release No Xalan'>
               <!-- GUID taken from 2.4.3 installer -->
               <Component Id='xsec_1_4_0.dll' Guid='{8920023D-92CA-4012-8BF8-6D80D791375D}'>
-                <File KeyPath='yes'
-                      Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Release No Xalan\xsec_$(var.XmlSecFileVersion).dll'/>
+                <File KeyPath='yes' Name='xsec_$(var.XmlSecFileVersion).dll'/>
               </Component>
               <Component Id='c14n.exe' Guid='{576EB311-AADA-49D3-B444-7EDC37C715F3}'>
-                <File KeyPath='yes' 
-                      Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Release No Xalan\c14n.exe'/>
+                <File KeyPath='yes' Name='c14n.exe'/>
               </Component>
               <Component Id='checksig.exe' Guid='{F0C2B97A-7B93-4CD3-9432-E5904D337815}'>
-                <File KeyPath='yes' 
-                      Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Release No Xalan\checksig.exe'/>
+                <File KeyPath='yes' Name='checksig.exe'/>
               </Component>
               <Component Id='cipher.exe' Guid='{654BB761-7B9D-4766-AC5F-DC174E7B94AE}'>
-                <File KeyPath='yes' 
-                      Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Release No Xalan\cipher.exe'/>
+                <File KeyPath='yes' Name='cipher.exe'/>
               </Component>
               <Component Id='siginf.exe' Guid='{1B278BD9-6507-4613-9315-8D47CAEBC3D8}'>
-                <File KeyPath='yes' 
-                      Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Release No Xalan\siginf.exe'/>
+                <File KeyPath='yes' Name='siginf.exe'/>
               </Component>
               <Component Id='templatesign.exe' Guid='{A24CD56C-F615-406E-B4E2-4AC5EAE99206}'>
-                <File KeyPath='yes' 
-                      Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Release No Xalan\templatesign.exe'/>
+                <File KeyPath='yes' Name='templatesign.exe'/>
               </Component>
               <Component Id='txfmout.exe' Guid='{667DD190-335B-4AB7-BBA5-25B5F847F363}'>
-                <File KeyPath='yes' 
-                      Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Release No Xalan\txfmout.exe'/>
+                <File KeyPath='yes' Name='txfmout.exe'/>
               </Component>
-              <Directory Id='lib_debug' Name='debug'>
+              <Directory Id='lib_debug' Name='debug' 
+                         FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Debug No Xalan'>
                 <Component Id='xsec_1_4_0D.dll' Guid='{9FF121C0-9C75-428E-A8A2-5DD0F499CA73}'>
-                  <File KeyPath='yes'
-                        Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\xsec_$(var.XmlSecFileVersion)D.dll'/>
+                  <File KeyPath='yes' Name='xsec_$(var.XmlSecFileVersion)D.dll'/>
                 </Component>
                 <Component Id='c14n.exe2' Guid='{20506FEA-CCFF-46A2-9753-DBBA8A967003}'>
-                  <File Id='c14n.exe_debug' KeyPath='yes'
-                        Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\c14n.exe'/>
+                  <File Id='c14n.exe_debug' KeyPath='yes' Name='c14n.exe'/>
                 </Component>
                 <Component Id='checksig.exe6' Guid='{6C2A1FC2-73F0-4EAE-A2CA-9C27A102E460}'>
-                  <File Id='checksig.exe_debug' KeyPath='yes'
-                        Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\checksig.exe'/>
+                  <File Id='checksig.exe_debug' KeyPath='yes' Name='checksig.exe'/>
                 </Component>
                 <Component Id='cipher.exe4' Guid='{BE90D2A6-0776-4E48-87F2-6DDE79D8E167}'>
-                  <File Id='cipher.exe_debug' KeyPath='yes'
-                        Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\cipher.exe'/>
+                  <File Id='cipher.exe_debug' KeyPath='yes' Name='cipher.exe'/>
                 </Component>
                 <Component Id='siginf.exe5' Guid='{D94E92D1-7B48-4FB2-A2B7-CC253FE27B7F}'>
-                  <File Id='siginf.exe_debug' KeyPath='yes'
-                        Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\siginf.exe'/>
+                  <File Id='siginf.exe_debug' KeyPath='yes' Name='siginf.exe'/>
                 </Component>
                 <Component Id='templatesign.exe3' Guid='{5E8264B4-D759-4502-B989-5A5C56FBD875}'>
-                  <File Id='templatesign.exe_debug' KeyPath='yes'
-                        Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\templatesign.exe'/>
+                  <File Id='templatesign.exe_debug' KeyPath='yes' Name='templatesign.exe'/>
                 </Component>
                 <Component Id='txfmout.exe1' Guid='{FCBFBCAA-5C39-470A-BD58-E558C384898D}'>
-                  <File Id='txfmout.exe_debug' KeyPath='yes'
-                        Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\txfmout.exe'/>
+                  <File Id='txfmout.exe_debug' KeyPath='yes' Name='txfmout.exe'/>
                 </Component>
               </Directory><!-- lib_debug-->
             </Directory><!-- lib -->
diff --git a/msi/WiX/MergeModules/XmlTooling-schemas.wxs b/msi/WiX/MergeModules/XmlTooling-schemas.wxs
index 5cb1e28..780073b 100644
--- a/msi/WiX/MergeModules/XmlTooling-schemas.wxs
+++ b/msi/WiX/MergeModules/XmlTooling-schemas.wxs
@@ -19,18 +19,25 @@
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Fragment>
-    <DirectoryRef Id='share_xml_xmltooling'
-                  FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\schemas\' >
-
-      <Component Id='xmltoolingschema' Guid='{2197D645-3AA3-46F1-B250-0F964B901A94}'>
-        <File Name='xenc-schema.xsd'/>
-        <File Name='xmldsig-core-schema.xsd'  />
-        <File Name='soap-envelope.xsd'  />
-        <File Name='xml.xsd'  />
-        <File Name='xmltooling.xsd'  />
-        <File Name='catalog.xml' Source='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\schemas\catalog.xml.in'  />
-        <File Name='xmldsig11-schema.xsd' />
-      </Component>
-    </DirectoryRef>
+    <DirectoryRef Id='TARGETDIR'>
+      <Directory Id='CommonAppDataFolder' Name='CommonFiles' >
+        <Directory Id='common_shibboleth' Name='Shibboleth' >
+          <Directory Id='common_sp' Name='SP' >
+            <Directory Id='common_doc' Name='doc' 
+                       FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\schemas\' >
+              <Component Id='xmltoolingschema' Guid='{2197D645-3AA3-46F1-B250-0F964B901A94}'>
+                <File Name='xenc-schema.xsd'/>
+                <File Name='xmldsig-core-schema.xsd'  />
+                <File Name='soap-envelope.xsd'  />
+                <File Name='xml.xsd'  />
+                <File Name='xmltooling.xsd'  />
+                <File Name='catalog.xml' Source='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\schemas\catalog.xml.in'  />
+                <File Name='xmldsig11-schema.xsd' />
+              </Component>
+            </Directory><!--common_doc-->
+          </Directory><!--common_sp-->
+        </Directory><!--common_shibboleth-->
+      </Directory><!--CommonAppDataFolder-->
+    </DirectoryRef><!--TargetDir-->
   </Fragment>
 </Wix>
diff --git a/msi/WiX/MergeModules/XmlTooling-x64.wxs b/msi/WiX/MergeModules/XmlTooling-x64.wxs
new file mode 100644
index 0000000..d340492
--- /dev/null
+++ b/msi/WiX/MergeModules/XmlTooling-x64.wxs
@@ -0,0 +1,59 @@
+<?xml version='1.0' encoding='utf-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?define BuildDirectory='G:\Downloads\shib\' ?>
+<?define XmlToolingVersion='1.4.2' ?> 
+<?define XmlToolingFileVersion='1_4' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='XmlToolingMergeModule_x64' Language='1033' Version='$(var.XmlToolingVersion)'>
+    <Package Id='{F944F719-7138-484D-A5B3-753411741B40}' Description='Merge Module for XMLTooling (x64)'
+             Comments='This module is built by the Shibboleth Consortium. Includes DDLs and Schema'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>
+
+    <!-- For now just install this where it is put we expect to go into lib and lib\debug below.  
+         At a a later date, we may chose to make this a placed module  -->
+
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <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-xmltooling\x64\Release'>
+              <Component Id='xmltooling.dll' Guid='{7BBFB3D8-A9F8-429B-96BE-C1B283EBFDFB}' Win64='yes'>
+                <File Id='xmltooling.dll' Name='xmltooling$(var.XmlToolingFileVersion).dll' />
+              </Component>
+              <Component Id='xmltoolinglite.dll' Guid='{060F61B9-36E9-4F33-9B5B-C59A43709052}' Win64='yes'>
+                <File Id='xmltoolinglite.dll' Name='xmltooling-lite$(var.XmlToolingFileVersion).dll' />
+              </Component>
+              <Directory Id='lib_debug' Name='debug' 
+                         FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\x64\Debug'>
+                <Component Id='xmltoolingD.dll' Guid='{C380627F-9D45-4626-A249-3831FC7C83FC}' Win64='yes'>
+                  <File Id='xmltoolingD.dll' Name='xmltooling$(var.XmlToolingFileVersion)D.dll' />
+                </Component>
+                <Component Id='xmltoolingliteD.dll' Guid='{2786A98E-763C-41A1-A6D5-363DB22F17E9}' Win64='yes'>
+                  <File Id='xmltoolingliteD.dll' Name='xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+          </Directory><!-- shibboleth_sp -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFiles -->
+    </Directory><!-- TARGETDIR -->
+    <ComponentRef Id='xmltoolingschema'/>
+  </Module>
+</Wix>
diff --git a/msi/WiX/MergeModules/XmlTooling-x64.wxs~ b/msi/WiX/MergeModules/XmlTooling-x64.wxs~
new file mode 100644
index 0000000..add03b7
--- /dev/null
+++ b/msi/WiX/MergeModules/XmlTooling-x64.wxs~
@@ -0,0 +1,67 @@
+<?xml version='1.0' encoding='utf-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?define BuildDirectory='G:\Downloads\shib\' ?>
+<?define XmlToolingVersion='1.4.2' ?> 
+<?define XmlToolingFileVersion='1_4' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='XmlToolingMergeModule_x86' Language='1033' Version='$(var.XmlToolingVersion)'>
+    <Package Id='{29A047F2-DECA-45A7-97D8-801217B3C632}' Description='Merge Module for XMLTooling'
+             Comments='This module is built by the Shibboleth Consortium. Includes DDLs and Schema'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>
+
+    <!-- For now just install this where it is put we expect to go into lib and lib\debug below.  
+         At a a later date, we may chose to make this a placed module  -->
+
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
+        <Directory Id='shibboleth' Name='Shibboleth'>
+          <Directory Id='shibboleth_sp' Name='SP'>
+            <Directory Id='lib' Name='lib'>
+              <Component Id='xmltooling.dll' Guid='{53533A59-A563-439D-B13D-A4D7090C42D3}'>
+                <File Id='xmltooling.dll'
+                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\Release\xmltooling$(var.XmlToolingFileVersion).dll' />
+              </Component>
+              <Component Id='xmltoolinglite.dll' Guid='{5045A722-D6D6-4E55-9196-CB7C50B4446F}'>
+                <File Id='xmltoolinglite.dll'
+                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\Release\xmltooling-lite$(var.XmlToolingFileVersion).dll' />
+              </Component>
+              <Directory Id='lib_debug' Name='debug'>
+                <Component Id='xmltoolingD.dll' Guid='{380E59DF-24F8-4F60-97A7-CC67FB76B4CC}'>
+                  <File Id='xmltoolingD.dll'
+                        Source='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\Debug\xmltooling$(var.XmlToolingFileVersion)D.dll' />
+                </Component>
+                <Component Id='xmltoolingliteD.dll' Guid='{DB6D8737-4E3D-4C06-87F1-C59C7D7CB47A}'>
+                  <File Id='xmltoolingliteD.dll'
+                        Source='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+            <Directory Id='share' Name='share'>
+              <Directory Id='share_xml' Name='xml'>
+                <Directory Id='share_xml_xmltooling' Name='xmltooling' />
+              </Directory><!-- xml-->
+            </Directory><!-- share -->
+          </Directory><!-- shibboleth_sp -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFiles -->
+    </Directory><!-- TARGETDIR -->
+    <ComponentRef Id='xmltoolingschema'/>
+  </Module>
+</Wix>
diff --git a/msi/WiX/MergeModules/XmlTooling-x86.wxs b/msi/WiX/MergeModules/XmlTooling-x86.wxs
index add03b7..38280ea 100644
--- a/msi/WiX/MergeModules/XmlTooling-x86.wxs
+++ b/msi/WiX/MergeModules/XmlTooling-x86.wxs
@@ -22,42 +22,30 @@
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Module Id='XmlToolingMergeModule_x86' Language='1033' Version='$(var.XmlToolingVersion)'>
-    <Package Id='{29A047F2-DECA-45A7-97D8-801217B3C632}' Description='Merge Module for XMLTooling'
+    <Package Id='{29A047F2-DECA-45A7-97D8-801217B3C632}' Description='Merge Module for XMLTooling (x86)'
              Comments='This module is built by the Shibboleth Consortium. Includes DDLs and Schema'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>
-
-    <!-- For now just install this where it is put we expect to go into lib and lib\debug below.  
-         At a a later date, we may chose to make this a placed module  -->
-
+             Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x86'/>
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
         <Directory Id='shibboleth' Name='Shibboleth'>
           <Directory Id='shibboleth_sp' Name='SP'>
-            <Directory Id='lib' Name='lib'>
+            <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\Release'>
               <Component Id='xmltooling.dll' Guid='{53533A59-A563-439D-B13D-A4D7090C42D3}'>
-                <File Id='xmltooling.dll'
-                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\Release\xmltooling$(var.XmlToolingFileVersion).dll' />
+                <File Id='xmltooling.dll' Name='xmltooling$(var.XmlToolingFileVersion).dll' />
               </Component>
               <Component Id='xmltoolinglite.dll' Guid='{5045A722-D6D6-4E55-9196-CB7C50B4446F}'>
-                <File Id='xmltoolinglite.dll'
-                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\Release\xmltooling-lite$(var.XmlToolingFileVersion).dll' />
+                <File Id='xmltoolinglite.dll' Name='xmltooling-lite$(var.XmlToolingFileVersion).dll' />
               </Component>
-              <Directory Id='lib_debug' Name='debug'>
+              <Directory Id='lib_debug' Name='debug' 
+                         FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\Debug'>
                 <Component Id='xmltoolingD.dll' Guid='{380E59DF-24F8-4F60-97A7-CC67FB76B4CC}'>
-                  <File Id='xmltoolingD.dll'
-                        Source='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\Debug\xmltooling$(var.XmlToolingFileVersion)D.dll' />
+                  <File Id='xmltoolingD.dll' Name='xmltooling$(var.XmlToolingFileVersion)D.dll' />
                 </Component>
                 <Component Id='xmltoolingliteD.dll' Guid='{DB6D8737-4E3D-4C06-87F1-C59C7D7CB47A}'>
-                  <File Id='xmltoolingliteD.dll'
-                        Source='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />
+                  <File Id='xmltoolingliteD.dll' Name='xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />
                 </Component>
               </Directory><!-- lib_debug-->
             </Directory><!-- lib -->
-            <Directory Id='share' Name='share'>
-              <Directory Id='share_xml' Name='xml'>
-                <Directory Id='share_xml_xmltooling' Name='xmltooling' />
-              </Directory><!-- xml-->
-            </Directory><!-- share -->
           </Directory><!-- shibboleth_sp -->
         </Directory><!-- shibboleth -->
       </Directory><!-- ProgramFiles -->
diff --git a/msi/WiX/MergeModules/Zlib-x64.wxs b/msi/WiX/MergeModules/Zlib-x64.wxs
new file mode 100644
index 0000000..e2a6740
--- /dev/null
+++ b/msi/WiX/MergeModules/Zlib-x64.wxs
@@ -0,0 +1,51 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?define BuildDirectory='G:\Downloads\shib\' ?>
+<?define ZlibVersion='1.2.5' ?>
+<?define ZlibFileVersion='1' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='ZlibMergeModule_x86' Language='1033' Version='$(var.ZlibVersion)'>
+    <Package Id='{68821F70-8952-4778-8149-85A93E4BF426}' Description='Merge Module for Zlib (x64)'
+             Comments='This module is built by the Shibboleth Consortium.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x64'/>
+
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>
+        <Directory Id='shibboleth' Name='Shibboleth'>
+          <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'
+                      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='{74D67C6F-655E-4E4D-A147-39F32DB6E796}' Win64='yes'>
+                  <File Id='zlib1d.dll' KeyPath='yes' 
+                        Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\projects\visualc6\Win32_DLL_Debug\zlib$(var.ZlibFileVersion)d.dll'/>
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+          </Directory><!-- shibboleth_sp -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix>
+
+    
diff --git a/msi/WiX/MergeModules/Zlib-x64.wxs~ b/msi/WiX/MergeModules/Zlib-x64.wxs~
new file mode 100644
index 0000000..3f62a2a
--- /dev/null
+++ b/msi/WiX/MergeModules/Zlib-x64.wxs~
@@ -0,0 +1,51 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?define BuildDirectory='G:\Downloads\shib\' ?>
+<?define ZlibVersion='1.2.5' ?>
+<?define ZlibFileVersion='1' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='ZlibMergeModule_x86' Language='1033' Version='$(var.ZlibVersion)'>
+    <Package Id='{F5C689A2-A72F-417E-B0F8-CF9B1450EE97}' Description='Merge Module for Zlib'
+             Comments='This module is built by the Shibboleth Consortium.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>
+
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
+        <Directory Id='shibboleth' Name='Shibboleth'>
+          <Directory Id='shibboleth_sp' Name='SP'>
+            <Directory Id='lib' Name='lib'>
+              <Component Id='zlib1.dll' Guid='{059557A8-7311-47BB-8A5F-CC85F72AE495}'>
+                <File KeyPath='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' 
+                        Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\projects\visualc6\Win32_DLL_Debug\zlib$(var.ZlibFileVersion)d.dll'/>
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+          </Directory><!-- shibboleth_sp -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix>
+
+    
diff --git a/msi/WiX/MergeModules/Zlib-x86.wxs b/msi/WiX/MergeModules/Zlib-x86.wxs
index 3f62a2a..b146599 100644
--- a/msi/WiX/MergeModules/Zlib-x86.wxs
+++ b/msi/WiX/MergeModules/Zlib-x86.wxs
@@ -21,9 +21,9 @@
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Module Id='ZlibMergeModule_x86' Language='1033' Version='$(var.ZlibVersion)'>
-    <Package Id='{F5C689A2-A72F-417E-B0F8-CF9B1450EE97}' Description='Merge Module for Zlib'
+    <Package Id='{F5C689A2-A72F-417E-B0F8-CF9B1450EE97}' Description='Merge Module for Zlib (x86)'
              Comments='This module is built by the Shibboleth Consortium.'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>
+             Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x86'/>
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
diff --git a/msi/WiX/MergeModules/te2.wxs b/msi/WiX/MergeModules/te2.wxs
new file mode 100644
index 0000000..c0ed7c7
--- /dev/null
+++ b/msi/WiX/MergeModules/te2.wxs
@@ -0,0 +1,69 @@
+<?xml version='1.0' encoding='utf-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Product Id='C59417F2-CCCA-4668-A39E-E7227D295D59' Name='Test Package1' Language='1033' UpgradeCode='{948E0C71-CC50-48C0-83F6-4D261A7521CA}'
+           Version='1.0.0.0' Manufacturer='Shibboleth Consortium' >
+    <Package Description='TEST Windows Installer package'
+             Comments='Ignore Ignore Ignore Ignore' Platform='x64'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='405' Compressed='yes' />
+
+    <Media Id='1' Cabinet='product.cab' EmbedCab='yes' />
+    <!-- Files -->
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFilesFolder' >
+        <Merge Id='XmlTooling-32' Language='1033' SourceFile='.\XmlTooling-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='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='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='XmlTooling-64' Language='1033' SourceFile='.\XmlTooling-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='OpenSAML-64' Language='1033' SourceFile='.\OpenSAML-x64.msm' DiskId='1' />
+        <Merge Id='Curl-64' Language='1033' SourceFile='.\Curl-x64.msm' DiskId='1' FileCompression='true' />
+        <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='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>
+
+    <!-- Feature -->
+    <Feature Id='MyFeature' Title='My 1st Feature' Level='1'>
+      <MergeRef Id='XmlTooling-32'/> 
+      <MergeRef Id='OpenSAML-32'/>
+      <MergeRef Id='XmlTooling-64'/> 
+      <MergeRef Id='OpenSAML-64'/>
+    </Feature>
+  </Product>
+</Wix>
diff --git a/msi/WiX/MergeModules/te2.wxs~ b/msi/WiX/MergeModules/te2.wxs~
new file mode 100644
index 0000000..992f261
--- /dev/null
+++ b/msi/WiX/MergeModules/te2.wxs~
@@ -0,0 +1,64 @@
+<?xml version='1.0' encoding='utf-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Product Id='C59417F2-CCCA-4668-A39E-E7227D295D59' Name='Test Package1' Language='1033' UpgradeCode='{948E0C71-CC50-48C0-83F6-4D261A7521CA}'
+           Version='1.0.0.0' Manufacturer='Shibboleth Consortium' >
+    <Package Description='TEST Windows Installer package'
+             Comments='Ignore Ignore Ignore Ignore' Platform='x64'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='405' Compressed='yes' />
+
+    <Media Id='1' Cabinet='product.cab' EmbedCab='yes' />
+    <!-- Files -->
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFilesFolder' >
+        <Merge Id='XmlTooling-32' Language='1033' SourceFile='.\XmlTooling-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='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='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' />
+        <Merge Id='Curl-64' Language='1033' SourceFile='.\Curl-x64.msm' DiskId='1' FileCompression='true' />
+        <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='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' />
+        <Merge Id='XmlTooling-64' Language='1033' SourceFile='.\XmlTooling-x64.msm' DiskId='1' />
+        <Merge Id='OpenSAML-64' Language='1033' SourceFile='.\OpenSAML-x64.msm' DiskId='1' /> -->
+      </Directory> 
+    </Directory>
+
+    <!-- Feature -->
+    <Feature Id='MyFeature' Title='My 1st Feature' Level='1'>
+      <MergeRef Id='XmlTooling-32'/> 
+      <MergeRef Id='OpenSAML-32'/>
+    </Feature>
+  </Product>
+</Wix>
diff --git a/msi/WiX/MergeModules/tes.wxs b/msi/WiX/MergeModules/tes.wxs
new file mode 100644
index 0000000..cfe5a89
--- /dev/null
+++ b/msi/WiX/MergeModules/tes.wxs
@@ -0,0 +1,81 @@
+<?xml version='1.0' encoding='utf-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Product Id='C59417F2-CCCA-4668-A39E-E7227D295D59' Name='Test Package1' Language='1033' UpgradeCode='{948E0C71-CC50-48C0-83F6-4D261A7521CA}'
+           Version='1.0.0.0' Manufacturer='Shibboleth Consortium' >
+    <Package Description='TEST Windows Installer package'
+             Comments='Ignore Ignore Ignore Ignore' Platform='x64'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='405' Compressed='yes' />
+
+    <Media Id='1' Cabinet='product.cab' EmbedCab='yes' />
+    <!-- Files -->
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFilesFolder' >
+        <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='OpenSAML-32' Language='1033' SourceFile='.\OpenSAML-x86.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='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' />
+        <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='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>
+
+    <!-- Feature -->
+    <Feature Id='MyFeature' Title='My 1st Feature' Level='1'>
+      <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='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-32'/> -->
+      <MergeRef Id='XmlTooling-64'/>
+      <MergeRef Id='Zlib-32'/>
+      <MergeRef Id='Zlib-64'/>
+    </Feature>
+  </Product>
+</Wix>
diff --git a/msi/WiX/MergeModules/tes.wxs~ b/msi/WiX/MergeModules/tes.wxs~
new file mode 100644
index 0000000..b31e74b
--- /dev/null
+++ b/msi/WiX/MergeModules/tes.wxs~
@@ -0,0 +1,81 @@
+<?xml version='1.0' encoding='utf-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Product Id='C59417F2-CCCA-4668-A39E-E7227D295D59' Name='Test Package1' Language='1033' UpgradeCode='{948E0C71-CC50-48C0-83F6-4D261A7521CA}'
+           Version='1.0.0.0' Manufacturer='Shibboleth Consortium' >
+    <Package Description='TEST Windows Installer package'
+             Comments='Ignore Ignore Ignore Ignore' Platform='x64'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='405' Compressed='yes' />
+
+    <Media Id='1' Cabinet='product.cab' EmbedCab='yes' />
+    <!-- Files -->
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFilesFolder' >
+        <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='OpenSAML-32' Language='1033' SourceFile='.\OpenSAML-x86.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='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' />
+        <Merge Id='Curl-64' Language='1033' SourceFile='.\Curl-x64.msm' DiskId='1' FileCompression='true' />
+        <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='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>
+
+    <!-- Feature -->
+    <Feature Id='MyFeature' Title='My 1st Feature' Level='1'>
+      <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='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-32'/> -->
+      <MergeRef Id='XmlTooling-64'/>
+      <MergeRef Id='Zlib-32'/>
+      <MergeRef Id='Zlib-64'/>
+    </Feature>
+  </Product>
+</Wix>
-- 
2.1.4