diff --git a/mysql.json b/mysql.json
index 847fa709ad..972e7e96bf 100644
--- a/mysql.json
+++ b/mysql.json
@@ -1,43 +1,62 @@
 {
     "homepage": "https://dev.mysql.com/downloads/mysql/",
-    "version": "5.7.22",
+    "version": "8.0.13",
     "license": "GPL-2.0",
     "architecture": {
         "64bit": {
-            "url": "https://dev.mysql.com/get/mysql-5.7.22-winx64.zip",
-            "hash": "5494b1facbea8daaa25862e9a4ee298a98c47fbb3eff5529f9779fd8486a5abe",
-            "extract_dir": "mysql-5.7.22-winx64"
-        },
-        "32bit": {
-            "url": "https://dev.mysql.com/get/mysql-5.7.22-win32.zip",
-            "hash": "c998915403cb52c0eca19291606db944c9fa8bcf06722e70226a591c80e97ea8",
-            "extract_dir": "mysql-5.7.22-win32"
+            "url": "https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-8.0.13-winx64.zip",
+            "hash": "md5:34a5983273314c99fdbc4a17b01d5859",
+            "extract_dir": "mysql-8.0.13-winx64"
         }
     },
     "bin": [
-        "bin\\mysqld.exe",
-        "bin\\mysql.exe",
-        "bin\\mysqldump.exe",
-        "bin\\mysqladmin.exe",
-        "bin\\mysqlbinlog.exe",
-        "bin\\mysqlcheck.exe",
-        "bin\\mysqlimport.exe",
-        "bin\\mysqlshow.exe",
-        "bin\\mysqlslap.exe",
-        "bin\\my_print_defaults.exe"
+        "bin/ibd2sdi.exe",
+        "bin/innochecksum.exe",
+        "bin/lz4_decompress.exe",
+        "bin/myisamchk.exe",
+        "bin/myisamlog.exe",
+        "bin/myisampack.exe",
+        "bin/myisam_ftdump.exe",
+        "bin/mysql.exe",
+        "bin/mysqladmin.exe",
+        "bin/mysqlbinlog.exe",
+        "bin/mysqlcheck.exe",
+        "bin/mysqld.exe",
+        "bin/mysqldump.exe",
+        "bin/mysqlimport.exe",
+        "bin/mysqlpump.exe",
+        "bin/mysqlrouter.exe",
+        "bin/mysqlrouter_plugin_info.exe",
+        "bin/mysqlshow.exe",
+        "bin/mysqlslap.exe",
+        "bin/mysql_config_editor.exe",
+        "bin/mysql_secure_installation.exe",
+        "bin/mysql_ssl_rsa_setup.exe",
+        "bin/mysql_tzinfo_to_sql.exe",
+        "bin/mysql_upgrade.exe",
+        "bin/my_print_defaults.exe",
+        "bin/perror.exe",
+        "bin/resolveip.exe",
+        "bin/zlib_decompress.exe"
     ],
     "persist": [
         "data"
     ],
     "post_install": [
-        "#Initialize data directory (without generating root password)",
-        "if (!(Test-Path \"$dir\\data\\auto.cnf\")) {",
-        "    mysqld --initialize-insecure",
+        "if (!(Test-Path \"$dir/my.ini\")) {",
+        "   # Using $dir instead of $persist_dir, causes this error:",
+        "   # [ERROR] [MY-010187] [Server] Could not open file 'C:/Users/ex/scoop/apps/mysql/current/data/host.err' for error logging: Permission denied",
+        "   $dir_u = ($persist_dir -replace '\\\\', '/')",
+        "   Add-Content \"$dir/my.ini\" '[mysqld]' -Encoding Ascii",
+        "   Add-Content \"$dir/my.ini\" \"datadir=$dir_u/data\" -Encoding Ascii",
+        "   # Set username so it's not required when connecting",
+        "   Add-Content \"$dir/my.ini\" '[client]' -Encoding Ascii",
+        "   Add-Content \"$dir/my.ini\" 'user=root' -Encoding Ascii",
         "}",
-        "#Output client configuration to my.ini file so no username is required when connecting",
-        "echo \"\" | out-file \"$dir/my.ini\" -Encoding ASCII -Append",
-        "echo \"[client]\" | out-file \"$dir/my.ini\" -Encoding ASCII -Append",
-        "echo \"user=root\" | out-file \"$dir/my.ini\" -Encoding ASCII -Append"
+        "if (!(Test-Path \"$dir/data\\auto.cnf\")) {",
+        "   # Initialize data directory (without generating root password)",
+        "   mysqld.exe --initialize-insecure",
+        "}"
     ],
     "checkver": {
         "url": "https://dev.mysql.com/downloads/mysql/",
@@ -46,12 +65,12 @@
     "autoupdate": {
         "architecture": {
             "64bit": {
-                "url": "https://dev.mysql.com/get/mysql-$version-winx64.zip",
-                "extract_dir": "mysql-$version-winx64"
-            },
-            "32bit": {
-                "url": "https://dev.mysql.com/get/mysql-$version-win32.zip",
-                "extract_dir": "mysql-$version-win32"
+                "url": "https://dev.mysql.com/get/Downloads/MySQL-$majorVersion.$minorVersion/mysql-$version-winx64.zip",
+                "extract_dir": "mysql-$version-winx64",
+                "hash": {
+                    "url": "https://dev.mysql.com/downloads/mysql/",
+                    "find": "md5\">([A-Fa-f\\d]{32})"
+                }
             }
         }
     }