diff --git a/src/Setup/Files.wxs b/src/Setup/Files.wxs
index 1c3f1a488a..08f515cf62 100644
--- a/src/Setup/Files.wxs
+++ b/src/Setup/Files.wxs
@@ -791,7 +791,7 @@
 									<Component Guid="C4A33C3E-91B6-4984-86B1-07C5C49C180D" Id="SourceAnalysisDll" DiskId="1">
 										<File Source="..\..\AddIns\Analysis\SourceAnalysis\SourceAnalysis.dll" Name="SourceAnalysis.dll" Id="SourceAnalysis.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="SourceAnalysis.dll" AssemblyManifest="SourceAnalysis.dll" />
 									</Component>
-								</Directory><!--
+								</Directory>
 								<Directory Id="MachineSpecifications" Name="MachineSpecifications">
 									<Component Id="MachineSpecificationsAddIn" Guid="03FD4FCC-670F-4298-8CEB-C957AD1BC7A8" DiskId="1">
 										<File Id="MachineSpecifications.addin" Name="MachineSpecifications.addin" Source="..\..\AddIns\Analysis\MachineSpecifications\MachineSpecifications.addin" KeyPath="yes" />
@@ -830,7 +830,7 @@
 											</Component>
 										</Directory>
 									</Directory>
-								</Directory>
+								</Directory><!--
 								<Directory Id="CodeQualityFolder" Name="CodeQuality">
 									<Component Guid="E821D255-269F-44BB-992E-BC98B8349B1C" Id="CodeQualityFiles" DiskId="1">
 										<File Source="..\..\AddIns\Analysis\CodeQuality\ICSharpCode.CodeQuality.dll" Id="ICSharpCode.CodeQuality.dll" Name="ICSharpCode.CodeQuality.dll" Assembly=".net" AssemblyApplication="ICSharpCode.CodeQuality.dll" AssemblyManifest="ICSharpCode.CodeQuality.dll" KeyPath="yes" />
diff --git a/src/Setup/Setup.wxs b/src/Setup/Setup.wxs
index 2a2caec160..23a2d11d37 100644
--- a/src/Setup/Setup.wxs
+++ b/src/Setup/Setup.wxs
@@ -469,7 +469,6 @@
 				<ComponentRef Id="CSharpTextTemplateFileTemplate"/>
 				<ComponentRef Id="VBTextTemplateFileTemplate"/>
 			
-				<!--
 				<ComponentRef Id="MachineSpecificationsAddIn"/>
 				<ComponentRef Id="MachineSpecificationsCommandLineDll"/>
 				<ComponentRef Id="MachineSpecificationsDll"/>
@@ -481,7 +480,6 @@
 				<ComponentRef Id="Mspec_x86_clr4Exe"/>
 				<ComponentRef Id="Mspec_x86Exe"/>
 				<ComponentRef Id="MspecExe"/>
-				-->
 				
 				<ComponentRef Id="AspNetMvcAddin"/>
 				<ComponentRef Id="AspNetMvcDll"/>