diff --git a/src/Jackett/Program.cs b/src/Jackett/Program.cs
index 52c0d18d5..08bd34a40 100644
--- a/src/Jackett/Program.cs
+++ b/src/Jackett/Program.cs
@@ -18,7 +18,7 @@ namespace Jackett
 {
     class Program
     {
-        public static string AppConfigDirectory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "Jackett");
+        public static string AppConfigDirectory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Jackett");
 
         public static Server ServerInstance { get; private set; }
 
@@ -36,6 +36,8 @@ namespace Jackett
         {
             ExitEvent = new ManualResetEvent(false);
 
+            MigrateSettingsDirectory();
+
             try
             {
                 if (!Directory.Exists(AppConfigDirectory))
@@ -111,6 +113,22 @@ namespace Jackett
             Console.WriteLine("Server thread exit");
         }
 
+        static void MigrateSettingsDirectory()
+        {
+            try
+            {
+                string oldDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "Jackett");
+                if (Directory.Exists(oldDir) && !Directory.Exists(AppConfigDirectory))
+                {
+                    Directory.Move(oldDir, AppConfigDirectory);
+                }
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine("ERROR could not migrate settings directory " + ex);
+            }
+        }
+
         static void ReadSettingsFile()
         {
             var path = Path.Combine(AppConfigDirectory, "config.json");