diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1
index 326bf6dae..3a7ec61b9 100644
--- a/images/macos/software-report/SoftwareReport.Common.psm1
+++ b/images/macos/software-report/SoftwareReport.Common.psm1
@@ -24,11 +24,32 @@ function Get-RVersion {
     $rVersion = Run-Command "R --version | grep 'R version'" | Take-Part -Part 2
     return "R $rVersion"
 }
+
 function Get-RustVersion {
     $rustVersion = Run-Command "rustc --version" | Take-Part -Part 1
     return "Rust $rustVersion"
 }
 
+function Get-RustfmtVersion {
+    $version = Run-Command "rustfmt --version" | Take-Part -Part 1
+    return "Rustfmt $version"
+}
+
+function Get-RustdocVersion {
+    $version = Run-Command "rustdoc --version" | Take-Part -Part 1
+    return "Rustdoc $version"
+}
+
+function Get-RustCargoVersion {
+    $version = Run-Command "cargo --version" | Take-Part -Part 1
+    return "Cargo $version"
+}
+
+function Get-RustClippyVersion {
+    $version = Run-Command "cargo clippy --version" | Take-Part -Part 1
+    return "Clippy $version"
+}
+
 function Get-Bindgen {
     $bindgenVersion = Run-Command "bindgen --version" | Take-Part -Part 1
     return "Bindgen $bindgenVersion"
@@ -446,4 +467,4 @@ function Get-SwiftLintVersion {
 function Get-PowershellVersion {
     $powershellVersion = Run-Command "powershell --version"
     return $powershellVersion
-}
\ No newline at end of file
+}
diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1
index 446973cd8..62cba7dc3 100644
--- a/images/macos/software-report/SoftwareReport.Generator.ps1
+++ b/images/macos/software-report/SoftwareReport.Generator.ps1
@@ -175,14 +175,18 @@ if ( -not $os.IsHighSierra) {
     $markdown += New-MDHeader "Rust Tools" -Level 3
     $markdown += New-MDList -Style Unordered -Lines @(
         (Get-RustVersion),
-        (Get-RustupVersion)
+        (Get-RustupVersion),
+        (Get-RustdocVersion),
+        (Get-RustCargoVersion)
     )
     $markdown += New-MDHeader "Packages" -Level 4
     $markdown += New-MDList -Style Unordered -Lines @(
         (Get-Bindgen),
         (Get-Cbindgen),
         (Get-Cargooutdated),
-        (Get-Cargoaudit)
+        (Get-Cargoaudit),
+        (Get-RustfmtVersion),
+        (Get-RustClippyVersion)
     )
 }