diff --git a/src/Jackett/Jackett.csproj b/src/Jackett/Jackett.csproj
index d99942c88..9f7154e49 100644
--- a/src/Jackett/Jackett.csproj
+++ b/src/Jackett/Jackett.csproj
@@ -274,6 +274,17 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <COMReference Include="IWshRuntimeLibrary">
+      <Guid>{F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}</Guid>
+      <VersionMajor>1</VersionMajor>
+      <VersionMinor>0</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>tlbimp</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </COMReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/Jackett/Main.cs b/src/Jackett/Main.cs
index 7ebbab2ff..129b9224c 100644
--- a/src/Jackett/Main.cs
+++ b/src/Jackett/Main.cs
@@ -5,6 +5,7 @@ using System.ComponentModel;
 using System.Data;
 using System.Diagnostics;
 using System.Drawing;
+using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Text;
@@ -57,20 +58,37 @@ namespace Jackett
         {
             get
             {
-                RegistryKey rkApp = Registry.CurrentUser.OpenSubKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run", true);
-                if (rkApp.GetValue(ProgramTitle) == null)
-                    return false;
-                else
-                    return true;
+                return File.Exists(ShortcutPath);
             }
             set
             {
-                RegistryKey rkApp = Registry.CurrentUser.OpenSubKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run", true);
                 if (value && !AutoStart)
-                    rkApp.SetValue(ProgramTitle, Application.ExecutablePath.ToString());
+                {
+                    CreateShortcut();
+                }
                 else if (!value && AutoStart)
-                    rkApp.DeleteValue(ProgramTitle, false);
+                {
+                    File.Delete(ShortcutPath);
+                }
             }
         }
+
+        public string ShortcutPath
+        {
+            get
+            {
+                return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Startup), "Jackett.lnk");
+            }
+        }
+
+        private void CreateShortcut()
+        {
+            var appPath = Assembly.GetExecutingAssembly().Location;
+            var shell = new IWshRuntimeLibrary.WshShell();
+            var shortcut = (IWshRuntimeLibrary.IWshShortcut)shell.CreateShortcut(ShortcutPath);
+            shortcut.Description = Assembly.GetExecutingAssembly().GetName().Name;
+            shortcut.TargetPath = appPath;
+            shortcut.Save();
+        }
     }
 }