diff --git a/CHANGELOG.md b/CHANGELOG.md
index c740b1940..996d0644d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Change Log
 All notable changes to the code converter will be documented here.
 
-# 6.4.0 TBC
+# 6.4.0 07/02/2019
 Fix initialization bug in VS2017
 
 ### C# -> VB
diff --git a/CodeConverter.Web/CodeConverter.Web.csproj b/CodeConverter.Web/CodeConverter.Web.csproj
index 2f66c7fab..07f1eea11 100644
--- a/CodeConverter.Web/CodeConverter.Web.csproj
+++ b/CodeConverter.Web/CodeConverter.Web.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
-    <AssemblyVersion>6.3.0.0</AssemblyVersion>
-    <FileVersion>6.3.0.0</FileVersion>
-    <Version>6.3.0</Version>
+    <AssemblyVersion>6.4.0.0</AssemblyVersion>
+    <FileVersion>6.4.0.0</FileVersion>
+    <Version>6.4.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/ICSharpCode.CodeConverter/ICSharpCode.CodeConverter.csproj b/ICSharpCode.CodeConverter/ICSharpCode.CodeConverter.csproj
index 9efa5a043..e5ad123da 100644
--- a/ICSharpCode.CodeConverter/ICSharpCode.CodeConverter.csproj
+++ b/ICSharpCode.CodeConverter/ICSharpCode.CodeConverter.csproj
@@ -12,9 +12,9 @@
 	* Completely free and open source: Check out [GitHub](https://github.com/icsharpcode/CodeConverter#code-converter-).</Description>
     <Product>Code Converter for C# to/from VB.NET</Product>
     <Copyright>Copyright (c) 2014-2018 AlphaSierraPapa</Copyright>
-    <AssemblyVersion>6.3.0.0</AssemblyVersion>
-    <FileVersion>6.3.0.0</FileVersion>
-    <Version>6.3.0</Version>
+    <AssemblyVersion>6.4.0.0</AssemblyVersion>
+    <FileVersion>6.4.0.0</FileVersion>
+    <Version>6.4.0</Version>
     <PackageId>ICSharpCode.CodeConverter</PackageId>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
diff --git a/Vsix/source.extension.vsixmanifest b/Vsix/source.extension.vsixmanifest
index 43abb0a8e..d7647eb4e 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="6.3.0.0" Language="en-US" Publisher="IC#Code"/>
+        <Identity Id="7e2a69d6-193b-4cdf-878d-3370d5931942" Version="6.4.0.0" Language="en-US" Publisher="IC#Code"/>
         <DisplayName>Code Converter C# to/from VB.NET</DisplayName>
         <Description xml:space="preserve">Based on Roslyn, this converter allows you to convert C# code to VB.NET and vice versa</Description>
         <License>license.txt</License>
diff --git a/appveyor.yml b/appveyor.yml
index 961f75f32..6b9e801b1 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,5 @@
 platform: Any CPU
-version: 6.3.{build}
+version: 6.4.{build}
 configuration: Debug
 image: Visual Studio 2017