diff --git a/Setup/Components/Configuration.wxs b/Setup/Components/Configuration.wxs
new file mode 100644
index 00000000..ebbb9f6d
--- /dev/null
+++ b/Setup/Components/Configuration.wxs
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Fragment>
+        <!-- These components will be auto-generated! -->
+    </Fragment>
+</Wix>
diff --git a/Setup/Components/Configuration.xslt b/Setup/Components/Configuration.xslt
new file mode 100644
index 00000000..e800d81a
--- /dev/null
+++ b/Setup/Components/Configuration.xslt
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:wix="http://schemas.microsoft.com/wix/2006/wi">
+    <xsl:output method="xml" indent="yes"/>
+    <xsl:template match="@*|node()">
+        <xsl:copy>
+            <xsl:apply-templates select="@*|node()" />
+        </xsl:copy>
+    </xsl:template>
+    <xsl:template match="wix:File[substring(@Source, string-length(@Source) - string-length('SEBConfigTool.exe') + 1) = 'SEBConfigTool.exe']">
+        <xsl:copy>
+            <xsl:apply-templates select="@*|node()" />
+            <xsl:attribute name="Id">
+                <xsl:text>ConfigurationToolExecutable</xsl:text>
+            </xsl:attribute>
+        </xsl:copy>
+    </xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/Setup/Directories.wxs b/Setup/Directories.wxs
index 862c1b77..e6aedbef 100644
--- a/Setup/Directories.wxs
+++ b/Setup/Directories.wxs
@@ -5,6 +5,7 @@
             <Directory Id="ProgramFilesFolder">
                 <Directory Id="InstallFolder" Name="SafeExamBrowser">
                     <Directory Id="ApplicationDirectory" Name="Application" />
+                    <Directory Id="ConfigurationDirectory" Name="Configuration" />
                     <Directory Id="ResetDirectory" Name="Reset" />
                     <Directory Id="ServiceDirectory" Name="Service" />
                 </Directory>
diff --git a/Setup/Product.wxs b/Setup/Product.wxs
index 8b94dc87..f89ac3b9 100644
--- a/Setup/Product.wxs
+++ b/Setup/Product.wxs
@@ -13,6 +13,7 @@
         <!-- <WixVariable Id="WixUIBannerBmp" Value="Resources\Banner.bmp" /> 493 × 58 -->
         <Feature Id="ProductFeature" Title="Safe Exam Browser" Level="1">
             <ComponentGroupRef Id="ApplicationComponents" />
+            <ComponentGroupRef Id="ConfigurationComponents" />
             <ComponentGroupRef Id="ResetComponents" />
             <ComponentGroupRef Id="ServiceComponents" />
             <ComponentRef Id="ShortcutComponent" />
diff --git a/Setup/Setup.wixproj b/Setup/Setup.wixproj
index 8c75815c..e4a73366 100644
--- a/Setup/Setup.wixproj
+++ b/Setup/Setup.wixproj
@@ -22,6 +22,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Components\Application.wxs" />
+    <Compile Include="Components\Configuration.wxs" />
     <Compile Include="Components\Reset.wxs" />
     <Compile Include="Components\Service.wxs" />
     <Compile Include="Directories.wxs" />
@@ -75,9 +76,18 @@
       <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
     </ProjectReference>
+    <ProjectReference Include="..\SebWindowsConfig\SebWindowsConfig.csproj">
+      <Name>SebWindowsConfig</Name>
+      <Project>{bef73897-0d04-4f40-ad89-62e24d260cd0}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Content Include="Components\Application.xslt" />
+    <Content Include="Components\Configuration.xslt" />
     <Content Include="Components\Service.xslt" />
     <Content Include="Components\Reset.xslt" />
     <Content Include="Resources\License.rtf" />
diff --git a/Setup/Shortcuts.wxs b/Setup/Shortcuts.wxs
index 76d3feb8..78a4f195 100644
--- a/Setup/Shortcuts.wxs
+++ b/Setup/Shortcuts.wxs
@@ -5,6 +5,9 @@
             <Shortcut Id="ApplicationShortcut" Name="Safe Exam Browser" Icon="ApplicationIcon" IconIndex="0" Advertise="no" Directory="ProgramMenuFolder"
                       Target="[ApplicationDirectory]\$(var.SafeExamBrowser.Runtime.TargetFileName)" WorkingDirectory="ApplicationDirectory"
                       Description="Starts the main application." />
+            <Shortcut Id="ConfigurationToolShortcut" Name="SEB Configuration Tool" Icon="ApplicationIcon" IconIndex="0" Advertise="no" Directory="StartMenuDirectory"
+                      Target="[ConfigurationDirectory]\$(var.SebWindowsConfig.TargetFileName)" WorkingDirectory="ConfigurationDirectory"
+                      Description="Provides options to edit configuration files for the main application." />
             <Shortcut Id="ResetUtilityShortcut" Name="SEB Reset Utility" Icon="ApplicationIcon" IconIndex="0" Advertise="no" Directory="StartMenuDirectory"
                       Target="[ResetDirectory]\$(var.SafeExamBrowser.ResetUtility.TargetFileName)" WorkingDirectory="ResetDirectory"
                       Description="Provides options to reset any changes made by the main application." />