diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba5a1dd85..25e51d368 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 ## [Unreleased]
 
 
+### Vsix
+
+
+### VB -> C#
+
+
+### C# -> VB
+
+
+## [8.1.5] - 2020-07-04
+
+
 ### Vsix
 * Workaround Visual Studio 16.7+ that was causing VB->CS conversion to fail [#586](https://github.com/icsharpcode/CodeConverter/issues/586)
 
diff --git a/CodeConverter/CodeConverter.csproj b/CodeConverter/CodeConverter.csproj
index 4d31ec195..e5b3076af 100644
--- a/CodeConverter/CodeConverter.csproj
+++ b/CodeConverter/CodeConverter.csproj
@@ -13,9 +13,9 @@ See https://github.com/icsharpcode/CodeConverter for a pre-built command line, v
 </Description>
     <Product>Code Converter for C# to/from VB.NET</Product>
     <Copyright>Copyright (c) 2017-2020 AlphaSierraPapa for the CodeConverter team</Copyright>
-    <AssemblyVersion>8.1.4.0</AssemblyVersion>
-    <FileVersion>8.1.4.0</FileVersion>
-    <Version>8.1.4</Version>
+    <AssemblyVersion>8.1.5.0</AssemblyVersion>
+    <FileVersion>8.1.5.0</FileVersion>
+    <Version>8.1.5</Version>
     <PackageId>ICSharpCode.CodeConverter</PackageId>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
diff --git a/CommandLine/CodeConv.NetFramework/CodeConv.NetFramework.csproj b/CommandLine/CodeConv.NetFramework/CodeConv.NetFramework.csproj
index 4b3d26e42..fa4fee0b7 100644
--- a/CommandLine/CodeConv.NetFramework/CodeConv.NetFramework.csproj
+++ b/CommandLine/CodeConv.NetFramework/CodeConv.NetFramework.csproj
@@ -6,8 +6,8 @@
     <AssemblyName>ICSharpCode.CodeConverter.CodeConv.NetFramework</AssemblyName>
     <RootNamespace>ICSharpCode.CodeConverter.CodeConv.NetFramework</RootNamespace>
     <ToolCommandName>codeconv</ToolCommandName>
-    <AssemblyVersion>8.1.4.0</AssemblyVersion>
-    <FileVersion>8.1.4.0</FileVersion>
+    <AssemblyVersion>8.1.5.0</AssemblyVersion>
+    <FileVersion>8.1.5.0</FileVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <LangVersion>8.0</LangVersion>
     <Nullable>enable</Nullable>
diff --git a/CommandLine/CodeConv/CodeConv.csproj b/CommandLine/CodeConv/CodeConv.csproj
index d8198baf7..ce7fe716f 100644
--- a/CommandLine/CodeConv/CodeConv.csproj
+++ b/CommandLine/CodeConv/CodeConv.csproj
@@ -9,9 +9,9 @@
     <AssemblyName>ICSharpCode.CodeConverter.CodeConv</AssemblyName>
     <RootNamespace>ICSharpCode.CodeConverter.CodeConv</RootNamespace>
     <ToolCommandName>codeconv</ToolCommandName>
-    <AssemblyVersion>8.1.4.0</AssemblyVersion>
-    <FileVersion>8.1.4.0</FileVersion>
-    <Version>8.1.4</Version>
+    <AssemblyVersion>8.1.5.0</AssemblyVersion>
+    <FileVersion>8.1.5.0</FileVersion>
+    <Version>8.1.5</Version>
     <Description>Bidirectional code converter for VB and C#
 This package contains a command line tool.
 For a nugetted dll, web converter or visual studio extension, see https://github.com/icsharpcode/CodeConverter</Description>
diff --git a/Vsix/Vsix.csproj b/Vsix/Vsix.csproj
index 9e8d768cb..cfa4f54ee 100644
--- a/Vsix/Vsix.csproj
+++ b/Vsix/Vsix.csproj
@@ -8,8 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <RootNamespace>ICSharpCode.CodeConverter.VsExtension</RootNamespace>
     <AssemblyName>ICSharpCode.CodeConverter.VsExtension</AssemblyName>
-    <AssemblyVersion>8.1.4.0</AssemblyVersion>
-    <FileVersion>8.1.4.0</FileVersion>
+    <AssemblyVersion>8.1.5.0</AssemblyVersion>
+    <FileVersion>8.1.5.0</FileVersion>
     <ProjectGuid>{99498EF8-C9E0-433B-8D7B-EA8E9E66F0C7}</ProjectGuid>
     <ProjectTypeGuids>{82B43B9B-A64C-4715-B499-D71E9CA2BD60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
diff --git a/Vsix/source.extension.vsixmanifest b/Vsix/source.extension.vsixmanifest
index b277adffe..312f9e100 100644
--- a/Vsix/source.extension.vsixmanifest
+++ b/Vsix/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="7e2a69d6-193b-4cdf-878d-3370d5931942" Version="8.1.4.0" Language="en-US" Publisher="IC#Code"/>
+        <Identity Id="7e2a69d6-193b-4cdf-878d-3370d5931942" Version="8.1.5.0" Language="en-US" Publisher="IC#Code"/>
         <DisplayName>Code Converter (VB - C#)</DisplayName>
         <Description xml:space="preserve">Convert VB.NET to C# and vice versa with this roslyn based converter</Description>
         <MoreInfo>https://github.com/icsharpcode/CodeConverter</MoreInfo>
diff --git a/Web/Web.csproj b/Web/Web.csproj
index 953f60ee4..abb5c2f80 100644
--- a/Web/Web.csproj
+++ b/Web/Web.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
-    <AssemblyVersion>8.1.4.0</AssemblyVersion>
-    <FileVersion>8.1.4.0</FileVersion>
-    <Version>8.1.4</Version>
+    <AssemblyVersion>8.1.5.0</AssemblyVersion>
+    <FileVersion>8.1.5.0</FileVersion>
+    <Version>8.1.5</Version>
     <LangVersion>7.3</LangVersion>
     <NoWarn>$(NoWarn);1998</NoWarn>
   </PropertyGroup>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 7591a8a10..3587d03fc 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -7,7 +7,7 @@ pr:
 variables:
   solution: '**/CodeConverter.sln'
   buildPlatform: 'Any CPU'
-  buildVersion: '8.1.4.$(Build.BuildId)'
+  buildVersion: '8.1.5.$(Build.BuildId)'
 
 pool:
   vmImage: 'windows-2019'