diff --git a/SafeExamBrowser.sln b/SafeExamBrowser.sln
index f723a258..3684cf42 100644
--- a/SafeExamBrowser.sln
+++ b/SafeExamBrowser.sln
@@ -68,6 +68,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser.Lockdown.Un
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser.ResetUtility", "SafeExamBrowser.ResetUtility\SafeExamBrowser.ResetUtility.csproj", "{BC229E80-FF93-424F-9930-D9C07D9B57B4}"
 EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Setup", "Setup\Setup.wixproj", "{0E14D163-557E-469E-9112-96936AF43A7B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -292,6 +294,12 @@ Global
 		{BC229E80-FF93-424F-9930-D9C07D9B57B4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BC229E80-FF93-424F-9930-D9C07D9B57B4}.Release|x86.ActiveCfg = Release|x86
 		{BC229E80-FF93-424F-9930-D9C07D9B57B4}.Release|x86.Build.0 = Release|x86
+		{0E14D163-557E-469E-9112-96936AF43A7B}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{0E14D163-557E-469E-9112-96936AF43A7B}.Debug|x86.ActiveCfg = Debug|x86
+		{0E14D163-557E-469E-9112-96936AF43A7B}.Debug|x86.Build.0 = Debug|x86
+		{0E14D163-557E-469E-9112-96936AF43A7B}.Release|Any CPU.ActiveCfg = Release|x86
+		{0E14D163-557E-469E-9112-96936AF43A7B}.Release|x86.ActiveCfg = Release|x86
+		{0E14D163-557E-469E-9112-96936AF43A7B}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Setup/Components/Application.wxs b/Setup/Components/Application.wxs
new file mode 100644
index 00000000..99aee2dc
--- /dev/null
+++ b/Setup/Components/Application.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>
\ No newline at end of file
diff --git a/Setup/Components/Reset.wxs b/Setup/Components/Reset.wxs
new file mode 100644
index 00000000..ff0e2485
--- /dev/null
+++ b/Setup/Components/Reset.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/Service.wxs b/Setup/Components/Service.wxs
new file mode 100644
index 00000000..ebbb9f6d
--- /dev/null
+++ b/Setup/Components/Service.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/Directories.wxs b/Setup/Directories.wxs
new file mode 100644
index 00000000..8a30b35d
--- /dev/null
+++ b/Setup/Directories.wxs
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Fragment>
+        <Directory Id="TARGETDIR" Name="SourceDir">
+            <Directory Id="ProgramFilesFolder">
+                <Directory Id="INSTALLFOLDER" Name="SafeExamBrowser">
+                    <Directory Id="ApplicationDirectory" Name="Application" />
+                    <!--<Directory Id="ResetDirectory" Name="Reset" />-->
+                    <!--<Directory Id="ServiceDirectory" Name="Service" />-->
+                </Directory>
+            </Directory>
+            <Directory Id="ProgramMenuFolder">
+                <Directory Id="StartMenuDirectory" Name="SafeExamBrowser"/>
+            </Directory>
+        </Directory>
+    </Fragment>
+</Wix>
diff --git a/Setup/Product.wxs b/Setup/Product.wxs
new file mode 100644
index 00000000..5e595db4
--- /dev/null
+++ b/Setup/Product.wxs
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Product Id="*" Name="Safe Exam Browser" Language="1033" Codepage="1252" Version="3.0.0" Manufacturer="ETH Zürich" UpgradeCode="97A8B13E-48FB-4BE1-A7C2-DD1863F95CCB">
+        <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
+        <MediaTemplate EmbedCab="yes" />
+        <UIRef Id="WixUI_Minimal" />
+        <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." AllowSameVersionUpgrades="yes" />
+        <Icon Id="ApplicationIcon" SourceFile="SafeExamBrowser.ico" />
+        <Property Id="ARPPRODUCTICON" Value="ApplicationIcon" />
+        <Feature Id="ProductFeature" Title="Safe Exam Browser" Level="1">
+            <ComponentGroupRef Id="ApplicationComponents" />
+            <ComponentGroupRef Id="Shortcuts" />
+            <!--<ComponentGroupRef Id="ResetComponents" />-->
+            <!--<ComponentGroupRef Id="ServiceComponents" />-->
+        </Feature>
+    </Product>
+</Wix>
diff --git a/Setup/SafeExamBrowser.ico b/Setup/SafeExamBrowser.ico
new file mode 100644
index 00000000..abdc4635
Binary files /dev/null and b/Setup/SafeExamBrowser.ico differ
diff --git a/Setup/Setup.wixproj b/Setup/Setup.wixproj
new file mode 100644
index 00000000..840314df
--- /dev/null
+++ b/Setup/Setup.wixproj
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>3.10</ProductVersion>
+    <ProjectGuid>0e14d163-557e-469e-9112-96936af43a7b</ProjectGuid>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputName>Setup</OutputName>
+    <OutputType>Package</OutputType>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <DefineConstants>Debug</DefineConstants>
+    <SuppressIces>ICE61</SuppressIces>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Components\Application.wxs" />
+    <Compile Include="Components\Reset.wxs" />
+    <Compile Include="Components\Service.wxs" />
+    <Compile Include="Directories.wxs" />
+    <Compile Include="Product.wxs" />
+    <Compile Include="Shortcuts.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="WixUIExtension">
+      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
+      <Name>WixUIExtension</Name>
+    </WixExtension>
+    <WixExtension Include="WixNetFxExtension">
+      <HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
+      <Name>WixNetFxExtension</Name>
+    </WixExtension>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Components" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\SafeExamBrowser.Runtime\SafeExamBrowser.Runtime.csproj">
+      <Name>SafeExamBrowser.Runtime</Name>
+      <Project>{e3aed2f8-b5df-45d1-ac19-48066923d6d8}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="SafeExamBrowser.ico" />
+  </ItemGroup>
+  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
+  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
+    <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
+  </Target>
+  <PropertyGroup>
+    <PreBuildEvent>"$(WIX)bin\heat.exe" dir "$(SolutionDir)SafeExamBrowser.Runtime\bin\$(PlatformName)\$(ConfigurationName)" -nologo -gg -g1 -srd -cg ApplicationComponents -dr ApplicationDirectory -sfrag -var var.SafeExamBrowser.Runtime.TargetDir -out $(ProjectDir)Components\Application.wxs</PreBuildEvent>
+  </PropertyGroup>
+  <!--
+	To modify your build process, add your task inside one of the targets below and uncomment it.
+	Other similar extension points exist, see Wix.targets.
+	<Target Name="BeforeBuild">
+	</Target>
+	<Target Name="AfterBuild">
+	</Target>
+	-->
+</Project>
\ No newline at end of file
diff --git a/Setup/Shortcuts.wxs b/Setup/Shortcuts.wxs
new file mode 100644
index 00000000..a255c9fb
--- /dev/null
+++ b/Setup/Shortcuts.wxs
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Fragment>
+        <ComponentGroup Id="Shortcuts">
+            <Component Id="ApplicationShortcutComponent" Guid="F6B8A57A-84BB-4264-96C5-3DD59F745E58" Directory="StartMenuDirectory">
+                <Shortcut Id="ApplicationShortcut" Name="Safe Exam Browser" Icon="ApplicationIcon" IconIndex="0" Advertise="no"
+                          Target="[ApplicationDirectory]\$(var.SafeExamBrowser.Runtime.TargetFileName)" WorkingDirectory="ApplicationDirectory" />
+                <RemoveFolder Id="StartMenuDirectory" On="uninstall" />
+                <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+            </Component>
+        </ComponentGroup>
+    </Fragment>
+</Wix>