diff --git a/Artemis/Artemis/Artemis.csproj b/Artemis/Artemis/Artemis.csproj
index 405039619..db4486bcd 100644
--- a/Artemis/Artemis/Artemis.csproj
+++ b/Artemis/Artemis/Artemis.csproj
@@ -807,7 +807,7 @@
- PreserveNewest
+ Always
Always
diff --git a/Artemis/Artemis/Resources/Artemis autorun.xml b/Artemis/Artemis/Resources/Artemis autorun.xml
index fe1ca09ac..bedb5b241 100644
Binary files a/Artemis/Artemis/Resources/Artemis autorun.xml and b/Artemis/Artemis/Resources/Artemis autorun.xml differ
diff --git a/Artemis/Artemis/Settings/GeneralSettings.cs b/Artemis/Artemis/Settings/GeneralSettings.cs
index 08dbb3333..81112b1dd 100644
--- a/Artemis/Artemis/Settings/GeneralSettings.cs
+++ b/Artemis/Artemis/Settings/GeneralSettings.cs
@@ -116,8 +116,9 @@ namespace Artemis.Settings
{
// Overwrite any existing tasks in case the installation folder changed
var path = Path.GetTempFileName();
+ var artemisPath = AppDomain.CurrentDomain.BaseDirectory.Substring(0, AppDomain.CurrentDomain.BaseDirectory.Length - 1);
var xml = Resources.Artemis_autorun
- .Replace("{{executablePath}}", AppDomain.CurrentDomain.BaseDirectory + "Artemis.exe")
+ .Replace("{{artemisPath}}", AppDomain.CurrentDomain.BaseDirectory)
.Replace("{{author}}", System.Security.Principal.WindowsIdentity.GetCurrent().Name);
File.WriteAllText(path, xml);