diff --git a/Directory.Packages.props b/Directory.Packages.props
index 7b22697..8f66c4b 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -14,7 +14,7 @@
     <!-- Tmds.DBus.Tool dependencies -->
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.8.0" />
-    <PackageVersion Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
+    <PackageVersion Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
 
     <!-- Test dependencies -->
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
diff --git a/src/Tmds.DBus.Tool/CodeGenCommand.cs b/src/Tmds.DBus.Tool/CodeGenCommand.cs
index c198f5c..6e96c4f 100644
--- a/src/Tmds.DBus.Tool/CodeGenCommand.cs
+++ b/src/Tmds.DBus.Tool/CodeGenCommand.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using System.Xml.Linq;
-using Microsoft.Extensions.CommandLineUtils;
+using McMaster.Extensions.CommandLineUtils;
 using Microsoft.CodeAnalysis;
 using Tmds.DBus.Protocol;
 
@@ -234,7 +234,7 @@ class CodeGenArguments
             public string OutputFileName { get; set; }
             public IEnumerable<string> SkipInterfaces { get; set; }
             public Dictionary<string, string> Interfaces { get; set; }
-            public List<string> Files { get; set; }
+            public IReadOnlyList<string> Files { get; set; }
             public bool NoInternalsVisibleTo { get; set; }
             public Accessibility TypesAccessModifier {get; set;}
             public bool ProtocolApi { get; set; }
diff --git a/src/Tmds.DBus.Tool/Command.cs b/src/Tmds.DBus.Tool/Command.cs
index abadb3a..b9afdba 100644
--- a/src/Tmds.DBus.Tool/Command.cs
+++ b/src/Tmds.DBus.Tool/Command.cs
@@ -1,4 +1,4 @@
-using Microsoft.Extensions.CommandLineUtils;
+using McMaster.Extensions.CommandLineUtils;
 using Tmds.DBus.Protocol;
 
 namespace Tmds.DBus.Tool
diff --git a/src/Tmds.DBus.Tool/ListCommand.cs b/src/Tmds.DBus.Tool/ListCommand.cs
index a392bba..dfebcc0 100644
--- a/src/Tmds.DBus.Tool/ListCommand.cs
+++ b/src/Tmds.DBus.Tool/ListCommand.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using System.Xml.Linq;
-using Microsoft.Extensions.CommandLineUtils;
+using McMaster.Extensions.CommandLineUtils;
 using Tmds.DBus.Protocol;
 
 namespace Tmds.DBus.Tool
@@ -146,7 +146,7 @@ public bool Visit(string path, XElement nodeXml)
             }
         }
 
-        private async Task ListInterfacesAsync(string address, string service, string path, bool recurse, List<string> files)
+        private async Task ListInterfacesAsync(string address, string service, string path, bool recurse, IReadOnlyList<string> files)
         {
             var visitor = new InterfacesVisitor();
             if (service != null)
diff --git a/src/Tmds.DBus.Tool/MonitorCommand.cs b/src/Tmds.DBus.Tool/MonitorCommand.cs
index 7088884..47f6120 100644
--- a/src/Tmds.DBus.Tool/MonitorCommand.cs
+++ b/src/Tmds.DBus.Tool/MonitorCommand.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.Extensions.CommandLineUtils;
+using McMaster.Extensions.CommandLineUtils;
 using Tmds.DBus.Protocol;
 
 namespace Tmds.DBus.Tool;
diff --git a/src/Tmds.DBus.Tool/Program.cs b/src/Tmds.DBus.Tool/Program.cs
index a681bcf..b575d2d 100644
--- a/src/Tmds.DBus.Tool/Program.cs
+++ b/src/Tmds.DBus.Tool/Program.cs
@@ -1,4 +1,4 @@
-using Microsoft.Extensions.CommandLineUtils;
+using McMaster.Extensions.CommandLineUtils;
 
 namespace Tmds.DBus.Tool
 {
diff --git a/src/Tmds.DBus.Tool/Tmds.DBus.Tool.csproj b/src/Tmds.DBus.Tool/Tmds.DBus.Tool.csproj
index 9493225..116bb0c 100644
--- a/src/Tmds.DBus.Tool/Tmds.DBus.Tool.csproj
+++ b/src/Tmds.DBus.Tool/Tmds.DBus.Tool.csproj
@@ -21,7 +21,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
     <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" />
-    <PackageReference Include="Microsoft.Extensions.CommandLineUtils" />
+    <PackageReference Include="McMaster.Extensions.CommandLineUtils" />
     <ProjectReference Include="../Tmds.DBus.Protocol/Tmds.DBus.Protocol.csproj" />
   </ItemGroup>
 </Project>