diff --git a/ship/make_msvc_package.py b/ship/make_msvc_package.py
index 2d10aac7..57ac336d 100755
--- a/ship/make_msvc_package.py
+++ b/ship/make_msvc_package.py
@@ -38,6 +38,12 @@
 os.chdir(common_ship.topDir)
 
 MSVC_VERSION_TABLE = {
+    "2022" : {
+        "package_name" : "msvc2022",
+        "gyp_version" : "2022",
+        "common_tools_env" : "VS170COMNTOOLS",
+        "xp_toolset" : "v170_xp",
+    },
     "2015" : {
         "package_name" : "msvc2015",
         "gyp_version" : "2015",
@@ -56,6 +62,9 @@
     "x64" : {
         "msvc_platform" : "x64",
     },
+    "arm64" : {
+        "msvc_platform" : "arm64",
+    },
     "ia32" : {
         "msvc_platform" : "Win32",
     },
@@ -63,7 +72,7 @@
 
 def readArguments():
     parser = argparse.ArgumentParser()
-    parser.add_argument("--msvc-version", default="2015")
+    parser.add_argument("--msvc-version", default="2022")
     ret = parser.parse_args()
     if ret.msvc_version not in MSVC_VERSION_TABLE:
         sys.exit("Error: unrecognized version: " + ret.msvc_version + ". " +
@@ -81,6 +90,12 @@ def checkoutGyp():
         "https://chromium.googlesource.com/external/gyp",
         "build-gyp"
     ])
+    subprocess.check_call([
+        "git.exe",
+        "clone",
+        "https://github.com/benjaminp/six.git",
+        "build-gyp/pylib/six"
+    ])
 
 def cleanMsvc():
     common_ship.rmrf("""
@@ -141,10 +156,11 @@ def buildPackage():
     common_ship.mkdir(packageDir)
 
     checkoutGyp()
+    # cleanMsvc()
+    # build("ia32", packageDir, True)
+    # build("x64", packageDir, True)
     cleanMsvc()
-    build("ia32", packageDir, True)
-    build("x64", packageDir, True)
-    cleanMsvc()
+    build("arm64", packageDir)
     build("ia32", packageDir)
     build("x64", packageDir)
 
diff --git a/src/configurations.gypi b/src/configurations.gypi
index e990a603..91ce570c 100644
--- a/src/configurations.gypi
+++ b/src/configurations.gypi
@@ -42,6 +42,9 @@
             'Release_x64': {
                 'msvs_configuration_platform': 'x64',
             },
+            'Release_arm64': {
+                'msvs_configuration_platform': 'arm64',
+            },
         },
         'msvs_configuration_attributes': {
             'OutputDirectory': '$(SolutionDir)$(ConfigurationName)\\$(Platform)',
diff --git a/winpty-0.4.4-dev-msvc2022.zip b/winpty-0.4.4-dev-msvc2022.zip
new file mode 100644
index 00000000..607474b0
Binary files /dev/null and b/winpty-0.4.4-dev-msvc2022.zip differ