diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba662adf..fb94b61e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@
 - Fixed macOS unit test setting preset [#665](https://github.com/yonaskolb/XcodeGen/pull/665) @yonaskolb
 - Add `rcproject` files to sources build phase instead of resources [#669](https://github.com/yonaskolb/XcodeGen/pull/669) @Qusic
 
+#### Internal
+
+- Updated to SwiftCLI 5.3.2 [#667](https://github.com/yonaskolb/XcodeGen/pull/667) @giginet
+
 ## 2.8.0
 
 #### Added
diff --git a/Package.resolved b/Package.resolved
index 3fbca4bd..6d7c6f0e 100644
--- a/Package.resolved
+++ b/Package.resolved
@@ -60,8 +60,8 @@
         "repositoryURL": "https://github.com/jakeheis/SwiftCLI.git",
         "state": {
           "branch": null,
-          "revision": "5318c37d3cacc8780f50b87a8840a6774320ebdf",
-          "version": "5.2.2"
+          "revision": "ba2268e67c07b9f9cfbc0801385e6238b36255eb",
+          "version": "5.3.2"
         }
       },
       {
diff --git a/Package.swift b/Package.swift
index b934012d..e6389e88 100644
--- a/Package.swift
+++ b/Package.swift
@@ -17,7 +17,7 @@ let package = Package(
         .package(url: "https://github.com/kylef/Spectre.git", from: "0.9.0"),
         .package(url: "https://github.com/onevcat/Rainbow.git", from: "3.0.0"),
         .package(url: "https://github.com/tuist/xcodeproj.git", .exact("7.1.0")),
-        .package(url: "https://github.com/jakeheis/SwiftCLI.git", .exact("5.2.2")),
+        .package(url: "https://github.com/jakeheis/SwiftCLI.git", .upToNextMinor(from: "5.3.2")),
     ],
     targets: [
         .target(name: "XcodeGen", dependencies: [
diff --git a/Sources/XcodeGenCLI/CommandRouter.swift b/Sources/XcodeGenCLI/CommandRouter.swift
deleted file mode 100644
index aa23770a..00000000
--- a/Sources/XcodeGenCLI/CommandRouter.swift
+++ /dev/null
@@ -1,20 +0,0 @@
-import Foundation
-import SwiftCLI
-
-class CommandRouter: Router {
-
-    let defaultCommand: Command
-
-    init(defaultCommand: Command) {
-        self.defaultCommand = defaultCommand
-    }
-
-    func parse(commandGroup: CommandGroup, arguments: ArgumentList) throws -> (CommandPath, OptionRegistry) {
-        if !arguments.hasNext() || arguments.nextIsOption() {
-            arguments.manipulate { existing in
-                [defaultCommand.name] + existing
-            }
-        }
-        return try DefaultRouter().parse(commandGroup: commandGroup, arguments: arguments)
-    }
-}
diff --git a/Sources/XcodeGenCLI/XcodeGenCLI.swift b/Sources/XcodeGenCLI/XcodeGenCLI.swift
index 6560ec6f..5a7e772c 100644
--- a/Sources/XcodeGenCLI/XcodeGenCLI.swift
+++ b/Sources/XcodeGenCLI/XcodeGenCLI.swift
@@ -3,7 +3,6 @@ import ProjectSpec
 import SwiftCLI
 
 public class XcodeGenCLI {
-
     let cli: CLI
 
     public init(version: Version) {
@@ -15,7 +14,7 @@ public class XcodeGenCLI {
             description: "Generates Xcode projects",
             commands: [generateCommand]
         )
-        cli.parser = Parser(router: CommandRouter(defaultCommand: generateCommand))
+        cli.parser.routeBehavior = .searchWithFallback(generateCommand)
     }
 
     public func execute(arguments: [String]? = nil) {