diff --git a/master/build-rust-manifest.py b/master/build-rust-manifest.py
index cac1d2d..bafe3df 100644
--- a/master/build-rust-manifest.py
+++ b/master/build-rust-manifest.py
@@ -332,7 +332,7 @@ def build_manifest(rustc_date, rustc_version, rustc_short_version,
 
     packages = {}
 
-    # Build all the non-rust packages. All the artifects here are
+    # Build all the non-rust packages. All the artifacts here are
     # already in the archives and will be verified.
     rustc_pkg = build_package_def_from_archive("rustc", "dist", rustc_date,
                                                rustc_version, rustc_short_version,
@@ -359,6 +359,13 @@ def build_manifest(rustc_date, rustc_version, rustc_short_version,
     packages["rust-mingw"] = mingw_pkg
     packages["rust-src"] = src_pkg
 
+    if channel == "nightly":
+        analysis_pkg = build_package_def_from_archive("rust-analysis", "dist", rustc_date,
+                                                      rustc_version, rustc_short_version,
+                                                      target_list)
+        packages["rust-analysis"] = analysis_pkg
+
+
     # Build the rust package. It is the only one with subcomponents
     rust_target_pkgs = {}
     for host in host_list:
@@ -404,6 +411,12 @@ def build_manifest(rustc_date, rustc_version, rustc_short_version,
             "target": "*",
         }]
 
+        if channel == "nightly":
+            extensions += [{
+            "pkg": "rust-analysis",
+            "target": target,
+        }]
+
         # The binaries of the 'rust' package are on the local disk.
         # url_and_hash_of_rust_package will try to locate them
         # and tell us where they are going to live on static.rust-lang.org