diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a6c0b4..3230ceb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@
 
 These are the changes to each version that has been released on the official [Visual Studio extension gallery](https://marketplace.visualstudio.com/items?itemName=unchase.UnchaseOpenAPIConnectedService).
 
+## v1.5.8 `(2020-11-13)`
+
+- [x] Update dependencies: add support for [NSwag.Commands v13.9.1](https://github.com/RicoSuter/NSwag/pull/3164)
+
 ## v1.5.7 `(2020-11-11)`
 
 - [x] Update dependencies: add support for [NSwag.Commands v13.9.0](https://github.com/RicoSuter/NSwag/pull/3157)
diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs
index 4ddb8a8..d047684 100644
--- a/src/Properties/AssemblyInfo.cs
+++ b/src/Properties/AssemblyInfo.cs
@@ -30,7 +30,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.2.*")]
-[assembly: AssemblyVersion("1.5.7")]
-[assembly: AssemblyFileVersion("1.5.7.0")]
+[assembly: AssemblyVersion("1.5.8")]
+[assembly: AssemblyFileVersion("1.5.8.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
 
diff --git a/src/Unchase.OpenAPI.ConnectedService.csproj b/src/Unchase.OpenAPI.ConnectedService.csproj
index 36db0ae..efe2c8b 100644
--- a/src/Unchase.OpenAPI.ConnectedService.csproj
+++ b/src/Unchase.OpenAPI.ConnectedService.csproj
@@ -456,53 +456,53 @@
       <HintPath>packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NJsonSchema, Version=10.3.0.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
-      <HintPath>packages\NJsonSchema.10.3.0\lib\net45\NJsonSchema.dll</HintPath>
+    <Reference Include="NJsonSchema, Version=10.3.1.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
+      <HintPath>packages\NJsonSchema.10.3.1\lib\net45\NJsonSchema.dll</HintPath>
     </Reference>
-    <Reference Include="NJsonSchema.CodeGeneration, Version=10.3.0.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
-      <HintPath>packages\NJsonSchema.CodeGeneration.10.3.0\lib\net451\NJsonSchema.CodeGeneration.dll</HintPath>
+    <Reference Include="NJsonSchema.CodeGeneration, Version=10.3.1.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
+      <HintPath>packages\NJsonSchema.CodeGeneration.10.3.1\lib\net451\NJsonSchema.CodeGeneration.dll</HintPath>
     </Reference>
-    <Reference Include="NJsonSchema.CodeGeneration.CSharp, Version=10.3.0.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
-      <HintPath>packages\NJsonSchema.CodeGeneration.CSharp.10.3.0\lib\net451\NJsonSchema.CodeGeneration.CSharp.dll</HintPath>
+    <Reference Include="NJsonSchema.CodeGeneration.CSharp, Version=10.3.1.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
+      <HintPath>packages\NJsonSchema.CodeGeneration.CSharp.10.3.1\lib\net451\NJsonSchema.CodeGeneration.CSharp.dll</HintPath>
     </Reference>
-    <Reference Include="NJsonSchema.CodeGeneration.TypeScript, Version=10.3.0.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
-      <HintPath>packages\NJsonSchema.CodeGeneration.TypeScript.10.3.0\lib\net451\NJsonSchema.CodeGeneration.TypeScript.dll</HintPath>
+    <Reference Include="NJsonSchema.CodeGeneration.TypeScript, Version=10.3.1.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
+      <HintPath>packages\NJsonSchema.CodeGeneration.TypeScript.10.3.1\lib\net451\NJsonSchema.CodeGeneration.TypeScript.dll</HintPath>
     </Reference>
-    <Reference Include="NJsonSchema.Yaml, Version=10.3.0.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
-      <HintPath>packages\NJsonSchema.Yaml.10.3.0\lib\net45\NJsonSchema.Yaml.dll</HintPath>
+    <Reference Include="NJsonSchema.Yaml, Version=10.3.1.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
+      <HintPath>packages\NJsonSchema.Yaml.10.3.1\lib\net45\NJsonSchema.Yaml.dll</HintPath>
     </Reference>
-    <Reference Include="NSwag.Annotations, Version=13.9.0.0, Culture=neutral, PublicKeyToken=c2d88086e098d109, processorArchitecture=MSIL">
-      <HintPath>packages\NSwag.Annotations.13.9.0\lib\net45\NSwag.Annotations.dll</HintPath>
+    <Reference Include="NSwag.Annotations, Version=13.9.1.0, Culture=neutral, PublicKeyToken=c2d88086e098d109, processorArchitecture=MSIL">
+      <HintPath>packages\NSwag.Annotations.13.9.1\lib\net45\NSwag.Annotations.dll</HintPath>
     </Reference>
-    <Reference Include="NSwag.AssemblyLoader, Version=13.9.0.0, Culture=neutral, PublicKeyToken=c2d88086e098d109, processorArchitecture=MSIL">
-      <HintPath>packages\NSwag.AssemblyLoader.13.9.0\lib\net451\NSwag.AssemblyLoader.dll</HintPath>
+    <Reference Include="NSwag.AssemblyLoader, Version=13.9.1.0, Culture=neutral, PublicKeyToken=c2d88086e098d109, processorArchitecture=MSIL">
+      <HintPath>packages\NSwag.AssemblyLoader.13.9.1\lib\net451\NSwag.AssemblyLoader.dll</HintPath>
     </Reference>
-    <Reference Include="NSwag.CodeGeneration, Version=13.9.0.0, Culture=neutral, PublicKeyToken=c2d88086e098d109, processorArchitecture=MSIL">
-      <HintPath>packages\NSwag.CodeGeneration.13.9.0\lib\net451\NSwag.CodeGeneration.dll</HintPath>
+    <Reference Include="NSwag.CodeGeneration, Version=13.9.1.0, Culture=neutral, PublicKeyToken=c2d88086e098d109, processorArchitecture=MSIL">
+      <HintPath>packages\NSwag.CodeGeneration.13.9.1\lib\net451\NSwag.CodeGeneration.dll</HintPath>
     </Reference>
-    <Reference Include="NSwag.CodeGeneration.CSharp, Version=13.9.0.0, Culture=neutral, PublicKeyToken=c2d88086e098d109, processorArchitecture=MSIL">
-      <HintPath>packages\NSwag.CodeGeneration.CSharp.13.9.0\lib\net451\NSwag.CodeGeneration.CSharp.dll</HintPath>
+    <Reference Include="NSwag.CodeGeneration.CSharp, Version=13.9.1.0, Culture=neutral, PublicKeyToken=c2d88086e098d109, processorArchitecture=MSIL">
+      <HintPath>packages\NSwag.CodeGeneration.CSharp.13.9.1\lib\net451\NSwag.CodeGeneration.CSharp.dll</HintPath>
     </Reference>
-    <Reference Include="NSwag.CodeGeneration.TypeScript, Version=13.9.0.0, Culture=neutral, PublicKeyToken=c2d88086e098d109, processorArchitecture=MSIL">
-      <HintPath>packages\NSwag.CodeGeneration.TypeScript.13.9.0\lib\net451\NSwag.CodeGeneration.TypeScript.dll</HintPath>
+    <Reference Include="NSwag.CodeGeneration.TypeScript, Version=13.9.1.0, Culture=neutral, PublicKeyToken=c2d88086e098d109, processorArchitecture=MSIL">
+      <HintPath>packages\NSwag.CodeGeneration.TypeScript.13.9.1\lib\net451\NSwag.CodeGeneration.TypeScript.dll</HintPath>
     </Reference>
-    <Reference Include="NSwag.Commands, Version=13.9.0.0, Culture=neutral, PublicKeyToken=c2d88086e098d109, processorArchitecture=MSIL">
-      <HintPath>packages\NSwag.Commands.13.9.0\lib\net461\NSwag.Commands.dll</HintPath>
+    <Reference Include="NSwag.Commands, Version=13.9.1.0, Culture=neutral, PublicKeyToken=c2d88086e098d109, processorArchitecture=MSIL">
+      <HintPath>packages\NSwag.Commands.13.9.1\lib\net461\NSwag.Commands.dll</HintPath>
     </Reference>
-    <Reference Include="NSwag.Core, Version=13.9.0.0, Culture=neutral, PublicKeyToken=c2d88086e098d109, processorArchitecture=MSIL">
-      <HintPath>packages\NSwag.Core.13.9.0\lib\net45\NSwag.Core.dll</HintPath>
+    <Reference Include="NSwag.Core, Version=13.9.1.0, Culture=neutral, PublicKeyToken=c2d88086e098d109, processorArchitecture=MSIL">
+      <HintPath>packages\NSwag.Core.13.9.1\lib\net45\NSwag.Core.dll</HintPath>
     </Reference>
-    <Reference Include="NSwag.Core.Yaml, Version=13.9.0.0, Culture=neutral, PublicKeyToken=c2d88086e098d109, processorArchitecture=MSIL">
-      <HintPath>packages\NSwag.Core.Yaml.13.9.0\lib\net45\NSwag.Core.Yaml.dll</HintPath>
+    <Reference Include="NSwag.Core.Yaml, Version=13.9.1.0, Culture=neutral, PublicKeyToken=c2d88086e098d109, processorArchitecture=MSIL">
+      <HintPath>packages\NSwag.Core.Yaml.13.9.1\lib\net45\NSwag.Core.Yaml.dll</HintPath>
     </Reference>
-    <Reference Include="NSwag.Generation, Version=13.9.0.0, Culture=neutral, PublicKeyToken=c2d88086e098d109, processorArchitecture=MSIL">
-      <HintPath>packages\NSwag.Generation.13.9.0\lib\net45\NSwag.Generation.dll</HintPath>
+    <Reference Include="NSwag.Generation, Version=13.9.1.0, Culture=neutral, PublicKeyToken=c2d88086e098d109, processorArchitecture=MSIL">
+      <HintPath>packages\NSwag.Generation.13.9.1\lib\net45\NSwag.Generation.dll</HintPath>
     </Reference>
-    <Reference Include="NSwag.Generation.AspNetCore, Version=13.9.0.0, Culture=neutral, PublicKeyToken=c2d88086e098d109, processorArchitecture=MSIL">
-      <HintPath>packages\NSwag.Generation.AspNetCore.13.9.0\lib\net451\NSwag.Generation.AspNetCore.dll</HintPath>
+    <Reference Include="NSwag.Generation.AspNetCore, Version=13.9.1.0, Culture=neutral, PublicKeyToken=c2d88086e098d109, processorArchitecture=MSIL">
+      <HintPath>packages\NSwag.Generation.AspNetCore.13.9.1\lib\net451\NSwag.Generation.AspNetCore.dll</HintPath>
     </Reference>
-    <Reference Include="NSwag.Generation.WebApi, Version=13.9.0.0, Culture=neutral, PublicKeyToken=c2d88086e098d109, processorArchitecture=MSIL">
-      <HintPath>packages\NSwag.Generation.WebApi.13.9.0\lib\net45\NSwag.Generation.WebApi.dll</HintPath>
+    <Reference Include="NSwag.Generation.WebApi, Version=13.9.1.0, Culture=neutral, PublicKeyToken=c2d88086e098d109, processorArchitecture=MSIL">
+      <HintPath>packages\NSwag.Generation.WebApi.13.9.1\lib\net45\NSwag.Generation.WebApi.dll</HintPath>
     </Reference>
     <Reference Include="NSwag.SwaggerGeneration, Version=12.3.1.0, Culture=neutral, PublicKeyToken=c2d88086e098d109, processorArchitecture=MSIL">
       <HintPath>packages\NSwag.SwaggerGeneration.12.3.1\lib\net45\NSwag.SwaggerGeneration.dll</HintPath>
diff --git a/src/app.config b/src/app.config
index b723160..ca609aa 100644
--- a/src/app.config
+++ b/src/app.config
@@ -88,11 +88,11 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="NSwag.Core" publicKeyToken="c2d88086e098d109" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-13.9.0.0" newVersion="13.9.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-13.9.1.0" newVersion="13.9.1.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="NJsonSchema" publicKeyToken="c2f9c3bdfae56102" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-10.3.0.0" newVersion="10.3.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-10.3.1.0" newVersion="10.3.1.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="NJsonSchema.CodeGeneration" publicKeyToken="c2f9c3bdfae56102" culture="neutral" />
diff --git a/src/packages.config b/src/packages.config
index c8c401d..6c2dd54 100644
--- a/src/packages.config
+++ b/src/packages.config
@@ -109,22 +109,22 @@
   <package id="NConsole" version="3.9.6519.30868" targetFramework="net461" />
   <package id="NETStandard.Library" version="2.0.3" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
-  <package id="NJsonSchema" version="10.3.0" targetFramework="net461" />
-  <package id="NJsonSchema.CodeGeneration" version="10.3.0" targetFramework="net461" />
-  <package id="NJsonSchema.CodeGeneration.CSharp" version="10.3.0" targetFramework="net461" />
-  <package id="NJsonSchema.CodeGeneration.TypeScript" version="10.3.0" targetFramework="net461" />
-  <package id="NJsonSchema.Yaml" version="10.3.0" targetFramework="net461" />
-  <package id="NSwag.Annotations" version="13.9.0" targetFramework="net461" />
-  <package id="NSwag.AssemblyLoader" version="13.9.0" targetFramework="net461" />
-  <package id="NSwag.CodeGeneration" version="13.9.0" targetFramework="net461" />
-  <package id="NSwag.CodeGeneration.CSharp" version="13.9.0" targetFramework="net461" />
-  <package id="NSwag.CodeGeneration.TypeScript" version="13.9.0" targetFramework="net461" />
-  <package id="NSwag.Commands" version="13.9.0" targetFramework="net461" />
-  <package id="NSwag.Core" version="13.9.0" targetFramework="net461" />
-  <package id="NSwag.Core.Yaml" version="13.9.0" targetFramework="net461" />
-  <package id="NSwag.Generation" version="13.9.0" targetFramework="net461" />
-  <package id="NSwag.Generation.AspNetCore" version="13.9.0" targetFramework="net461" />
-  <package id="NSwag.Generation.WebApi" version="13.9.0" targetFramework="net461" />
+  <package id="NJsonSchema" version="10.3.1" targetFramework="net461" />
+  <package id="NJsonSchema.CodeGeneration" version="10.3.1" targetFramework="net461" />
+  <package id="NJsonSchema.CodeGeneration.CSharp" version="10.3.1" targetFramework="net461" />
+  <package id="NJsonSchema.CodeGeneration.TypeScript" version="10.3.1" targetFramework="net461" />
+  <package id="NJsonSchema.Yaml" version="10.3.1" targetFramework="net461" />
+  <package id="NSwag.Annotations" version="13.9.1" targetFramework="net461" />
+  <package id="NSwag.AssemblyLoader" version="13.9.1" targetFramework="net461" />
+  <package id="NSwag.CodeGeneration" version="13.9.1" targetFramework="net461" />
+  <package id="NSwag.CodeGeneration.CSharp" version="13.9.1" targetFramework="net461" />
+  <package id="NSwag.CodeGeneration.TypeScript" version="13.9.1" targetFramework="net461" />
+  <package id="NSwag.Commands" version="13.9.1" targetFramework="net461" />
+  <package id="NSwag.Core" version="13.9.1" targetFramework="net461" />
+  <package id="NSwag.Core.Yaml" version="13.9.1" targetFramework="net461" />
+  <package id="NSwag.Generation" version="13.9.1" targetFramework="net461" />
+  <package id="NSwag.Generation.AspNetCore" version="13.9.1" targetFramework="net461" />
+  <package id="NSwag.Generation.WebApi" version="13.9.1" targetFramework="net461" />
   <package id="NSwag.SwaggerGeneration" version="12.3.1" targetFramework="net461" />
   <package id="NSwag.SwaggerGeneration.AspNetCore" version="12.3.1" targetFramework="net461" />
   <package id="NSwag.SwaggerGeneration.WebApi" version="12.3.1" targetFramework="net461" />
diff --git a/src/source.extension.vsixmanifest b/src/source.extension.vsixmanifest
index 070f9b2..29ab6f7 100644
--- a/src/source.extension.vsixmanifest
+++ b/src/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="Unchase.Openapi.ConnectedService.63199638-6211-4285-ba8f-75b1f0326c2a" Version="1.5.7" Language="en-US" Publisher="Unchase" />
+        <Identity Id="Unchase.Openapi.ConnectedService.63199638-6211-4285-ba8f-75b1f0326c2a" Version="1.5.8" Language="en-US" Publisher="Unchase" />
         <DisplayName>Unchase OpenAPI (Swagger) Connected Service</DisplayName>
         <Description xml:space="preserve">Connected service for Visual Studio to generate OpenAPI (Swagger) web service reference.</Description>
         <MoreInfo>https://github.com/unchase/Unchase.OpenAPI.Connectedservice</MoreInfo>