diff --git a/src/Setup/Files.wxs b/src/Setup/Files.wxs
index cb00ad58af..20a85769f9 100644
--- a/src/Setup/Files.wxs
+++ b/src/Setup/Files.wxs
@@ -1460,32 +1460,32 @@
 											<File Source="..\..\AddIns\AddIns\Misc\UsageDataCollector\UsageDataCollector.xml" Name="UsageDataCollector.xml" Id="UsageDataCollector.xml" />
 										</Component>
 									</Directory>
-									<!--<Directory Id="SharpDevelopReports" Name="SharpDevelopReports">
-										<Component Guid="F5963875-6D36-4789-8129-7224EA7434E0" Id="SharpDevelopReportsEmptyReportFileTemplate" DiskId="1">
+									<Directory Id="SharpDevelopReports" Name="SharpDevelopReports">
+										<Component Guid="9D0B24E0-6BE3-4E0A-AE50-DFF55BAE388F" Id="SharpDevelopReportsEmptyReportFileTemplate" DiskId="1">
 											<File Source="..\..\AddIns\AddIns\Misc\SharpDevelopReports\EmptyReport.xft" Name="EmptyReport.xft" Id="SharpDevelopReportsEmptyReport.xft" KeyPath="yes" />
 										</Component>
-										<Component Guid="428E9B37-E8B7-4A23-99A8-0212AB51B201" Id="ICSharpCodeReportDesignerAddin" DiskId="1">
+										<Component Guid="70F6CB6E-5776-4157-BABB-1D01960CFD42" Id="ICSharpCodeReportDesignerAddin" DiskId="1">
 											<File Source="..\..\AddIns\AddIns\Misc\SharpDevelopReports\ICSharpCode.ReportDesigner.addin" Name="ICSharpCode.ReportDesigner.addin" Id="ICSharpCode.ReportDesigner.addin" KeyPath="yes" />
 										</Component>
-										<Component Guid="8C6177C2-455B-407C-9628-C286AF042100" Id="ICSharpCodeReportsAddinDll" DiskId="1">
+										<Component Guid="368CD4A5-70EA-4374-AF4E-A4328DE66680" Id="ICSharpCodeReportsAddinDll" DiskId="1">
 											<File Source="..\..\AddIns\AddIns\Misc\SharpDevelopReports\ICSharpCode.Reports.Addin.dll" Name="ICSharpCode.Reports.Addin.dll" Id="ICSharpCode.Reports.Addin.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="ICSharpCode.Reports.Addin.dll" AssemblyManifest="ICSharpCode.Reports.Addin.dll" />
 										</Component>
-										<Component Guid="3F3BA5B0-7C06-4DEA-9D61-9AA3FB70CA3C" Id="ICSharpCodeReportsCoreDll" DiskId="1">
+										<Component Guid="0836040D-7E4A-42CA-A291-BE8AAB207D29" Id="ICSharpCodeReportsCoreDll" DiskId="1">
 											<File Source="..\..\AddIns\AddIns\Misc\SharpDevelopReports\ICSharpCode.Reports.Core.dll" Name="ICSharpCode.Reports.Core.dll" Id="ICSharpCode.Reports.Core.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="ICSharpCode.Reports.Core.dll" AssemblyManifest="ICSharpCode.Reports.Core.dll" />
 										</Component>
-										<Component Guid="1A9CDE4B-0A0D-4B1F-9947-365FC93A1956" Id="InteropAdodbDll" DiskId="1">
+										<Component Guid="B897FC22-C1B1-4072-8617-D19FBEC8C38A" Id="InteropAdodbDll" DiskId="1">
 											<File Source="..\..\AddIns\AddIns\Misc\SharpDevelopReports\Interop.ADODB.dll" Name="Interop.ADODB.dll" Id="Interop.ADODB.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="Interop.ADODB.dll" AssemblyManifest="Interop.ADODB.dll" />
 										</Component>
-										<Component Guid="6C7B83C6-F3CB-4CDE-99FF-84986FB8539B" Id="InteropMsdascDll" DiskId="1">
+										<Component Guid="557F8F25-D35A-4F07-9F81-5F555766147C" Id="InteropMsdascDll" DiskId="1">
 											<File Source="..\..\AddIns\AddIns\Misc\SharpDevelopReports\Interop.MSDASC.dll" Name="Interop.MSDASC.dll" Id="Interop.MSDASC.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="Interop.MSDASC.dll" AssemblyManifest="Interop.MSDASC.dll" />
 										</Component>
-										<Component Guid="6A8AA4D2-6CC6-4A03-9705-91FC39818A29" Id="IronyDll" DiskId="1">
+										<Component Guid="DBF1DA4F-19BA-46AF-86A4-B3228424F219" Id="IronyDll" DiskId="1">
 											<File Source="..\..\AddIns\AddIns\Misc\SharpDevelopReports\Irony.dll" Name="Irony.dll" Id="Irony.dll" KeyPath="yes" />
 										</Component>
-										<Component Guid="CF7C7E01-B229-4E72-92CA-66B9935DE79A" Id="ITextSharpDll" DiskId="1">
+										<Component Guid="A105D4E4-2AF4-43BE-AA71-15F14DA4163B" Id="ITextSharpDll" DiskId="1">
 											<File Source="..\..\AddIns\AddIns\Misc\SharpDevelopReports\itextsharp.dll" Name="itextsharp.dll" Id="itextsharp.dll" KeyPath="yes" />
 										</Component>
-									</Directory>-->
+									</Directory>
 								</Directory>
 							</Directory>
 						</Directory>
diff --git a/src/Setup/Setup.wxs b/src/Setup/Setup.wxs
index e1091fbe15..996ed7e5c7 100644
--- a/src/Setup/Setup.wxs
+++ b/src/Setup/Setup.wxs
@@ -466,14 +466,14 @@
 				<ComponentRef Id="UsageDataCollectorAddin"/>
 				<ComponentRef Id="UsageDataCollectorDll"/>
 				
-				<!--<ComponentRef Id="SharpDevelopReportsEmptyReportFileTemplate"/>
+				<ComponentRef Id="SharpDevelopReportsEmptyReportFileTemplate"/>
 				<ComponentRef Id="ICSharpCodeReportDesignerAddin"/>
 				<ComponentRef Id="ICSharpCodeReportsAddinDll"/>
 				<ComponentRef Id="ICSharpCodeReportsCoreDll"/>
 				<ComponentRef Id="InteropMsdascDll"/>
 				<ComponentRef Id="InteropAdodbDll"/>
 				<ComponentRef Id="IronyDll"/>
-				<ComponentRef Id="ITextSharpDll"/>-->
+				<ComponentRef Id="ITextSharpDll"/>
 			</Feature>
 			<Feature Id="SharpDevelopFileAssociations"
 			         Level="2"