diff --git a/AlphaFS.Doc/AlphaFS.Doc.shfbproj b/AlphaFS.Doc/AlphaFS.Doc.shfbproj
index d42b1266f..d48fe4dab 100644
--- a/AlphaFS.Doc/AlphaFS.Doc.shfbproj
+++ b/AlphaFS.Doc/AlphaFS.Doc.shfbproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <!-- The configuration and platform will be used to determine which
@@ -37,7 +37,7 @@
     <CopyrightText>Copyright %28C%29 2008-2016 Peter Palotas, Jeffrey Jangli, Alexandr Normuradov</CopyrightText>
     <PresentationStyle>VS2013</PresentationStyle>
     <SyntaxFilters>Standard</SyntaxFilters>
-    <HelpFileVersion>2.0.0.9300</HelpFileVersion>
+    <HelpFileVersion>2.1.2.9300</HelpFileVersion>
     <DocumentationSources>
       <DocumentationSource sourceFile="..\Bin\$(Configuration)\Net452\AlphaFS.dll" />
       <DocumentationSource sourceFile="..\Bin\$(Configuration)\Net452\AlphaFS.xml" />
@@ -75,10 +75,10 @@ Additional classes and methods are provided to provide more advanced functionali
   <!-- There are no properties for these two groups but they need to appear in
        order for Visual Studio to perform the build. -->
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-     <OutputPath>..\Bin\Documentation\</OutputPath>
+    <OutputPath>..\Bin\Documentation\</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-     <OutputPath>..\Bin\Documentation\</OutputPath>
+    <OutputPath>..\Bin\Documentation\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
     <None Include="License.aml" />
diff --git a/AlphaFS.nuspec b/AlphaFS.nuspec
index 89bc383f9..5f84f833c 100644
--- a/AlphaFS.nuspec
+++ b/AlphaFS.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
    <metadata>
       <id>AlphaFS</id>
-      <version>2.1.0.0</version>
+      <version>2.1.1.0</version>
       <title>AlphaFS</title>
       <authors>Peter Palotas,Jeffrey Jangli,Alexandr Normuradov</authors>
       <owners>Peter Palotas</owners>
diff --git a/AlphaFS/AssemblyVersionInfo.cs b/AlphaFS/AssemblyVersionInfo.cs
index 388181804..efb954d3a 100644
--- a/AlphaFS/AssemblyVersionInfo.cs
+++ b/AlphaFS/AssemblyVersionInfo.cs
@@ -19,8 +19,6 @@
  *  THE SOFTWARE. 
  */
 using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
 using System.Resources;
 
 [assembly: AssemblyCompany("")]
@@ -29,7 +27,7 @@
 [assembly: AssemblyTrademark("")]
 
 [assembly: AssemblyVersion("2.1.0.0")]
-[assembly: AssemblyFileVersion("2.1.0.0")]
+[assembly: AssemblyFileVersion("2.1.2.0")]
 [assembly: AssemblyInformationalVersion("2.0")]
 [assembly: NeutralResourcesLanguageAttribute("en-US")]
 
diff --git a/BuildRelease.proj b/BuildRelease.proj
index 7c895c452..5c56f796a 100644
--- a/BuildRelease.proj
+++ b/BuildRelease.proj
@@ -8,6 +8,26 @@
       <DistDir>$(MSBuildThisFileDirectory)Dist</DistDir>
    </PropertyGroup>
 
+   <UsingTask
+     TaskName="GetFileVersion"
+     TaskFactory="CodeTaskFactory"
+     AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
+      <ParameterGroup>
+         <AssemblyPath ParameterType="System.String" Required="true" />
+         <Version ParameterType="System.String" Output="true" />
+      </ParameterGroup>
+      <Task>
+         <Using Namespace="System.Diagnostics" />
+         <Code Type="Fragment" Language="cs">
+            <![CDATA[
+       Log.LogMessage("Getting version details of assembly at: " + this.AssemblyPath, MessageImportance.High);
+
+       this.Version = FileVersionInfo.GetVersionInfo(this.AssemblyPath).FileVersion;  
+     ]]>
+         </Code>
+      </Task>
+   </UsingTask>
+   
    <ItemGroup>
       <TargetList Condition="  '@(TargetList)' == '' " Include="Rebuild" />
    </ItemGroup>
@@ -44,9 +64,9 @@
                Targets="@(TargetList)"
                SkipNonexistentProjects="true" />
 
-      <GetAssemblyIdentity AssemblyFiles="$(MSBuildProjectDirectory)\Bin\$(Configuration)\Net451\AlphaFS.dll">
-         <Output TaskParameter="Assemblies" ItemName="AlphaFSAssembly" />
-      </GetAssemblyIdentity>
+      <GetFileVersion AssemblyPath="$(MSBuildProjectDirectory)\Bin\$(Configuration)\Net451\AlphaFS.dll">
+         <Output TaskParameter="Version" PropertyName="AlphaFSFileVersion" />
+      </GetFileVersion>
 
       <ItemGroup>
          <FilesToClean Include="$(DistDir)\**\*"/>
@@ -57,7 +77,7 @@
       <RemoveDir Directories="$(DistDir)" />
       <MakeDir Directories="$(DistDir)" />
 
-      <Exec Command="&quot;$(MSBuildThisFileDirectory)packages\NuGet.CommandLine.3.4.4-rtm-final\tools\NuGet.exe&quot; pack &quot;$(ProjectDir)AlphaFS.nuspec&quot; -NoPackageAnalysis -Version %(AlphaFSAssembly.Version) -OutputDirectory $(DistDir)" WorkingDirectory="$(TargetDir)" LogStandardErrorAsError="true" ConsoleToMSBuild="true">
+      <Exec Command="&quot;$(MSBuildThisFileDirectory)packages\NuGet.CommandLine.3.4.4-rtm-final\tools\NuGet.exe&quot; pack &quot;$(ProjectDir)AlphaFS.nuspec&quot; -NoPackageAnalysis -Version $(AlphaFSFileVersion) -OutputDirectory $(DistDir)" WorkingDirectory="$(TargetDir)" LogStandardErrorAsError="true" ConsoleToMSBuild="true">
          <Output TaskParameter="ConsoleOutput" PropertyName="OutputOfExec" />
       </Exec>
 
@@ -81,12 +101,12 @@
          <StaticFiles Include="$(MSBuildThisFileDirectory)\README.md" />
       </ItemGroup>
 
-      <Move SourceFiles="$(MSBuildThisFileDirectory)\Bin\Documentation\AlphaFS.chm" DestinationFiles="$(DistDir)\Zip\AlphaFS.%(AlphaFSAssembly.Version).chm" />
+      <Move SourceFiles="$(MSBuildThisFileDirectory)\Bin\Documentation\AlphaFS.chm" DestinationFiles="$(DistDir)\Zip\AlphaFS.$(AlphaFSFileVersion).chm" />
 
       <Copy SourceFiles="@(BinFiles)" DestinationFiles="@(BinFiles->'$(DistDir)\Zip\Lib\%(Configuration)\%(Filename)%(Extension)')" />
       <Copy SourceFiles="@(StaticFiles)" DestinationFolder="$(DistDir)\Zip" />
 
-      <Exec Command="PowerShell -command Compress-Archive &quot;$(DistDir)\Zip\*&quot; $(DistDir)\AlphaFS.%(AlphaFSASsembly.Version).zip" />
+      <Exec Command="PowerShell -command Compress-Archive &quot;$(DistDir)\Zip\*&quot; $(DistDir)\AlphaFS.$(AlphaFSFileVersion).zip" />
 
    </Target>
 </Project>
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0adb98e73..ad5106ca8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 Changelog
 =========
 
-Version 2.1.1  (2016-xx-xx)
+Version 2.1.2  (2016-10-30)
 -------------
 
 ### Bugs Fixed
@@ -199,7 +199,7 @@ Version 2.0  (2015-01-16)
 * Renamed delegate CopyProgressResult to CopyMoveProgressResult.
 
 
-Version 1.5
+Version 1.5  (2014-05-20)
 -----------
    * New: Various file system objects enumeration methods in Directory class.
    * Numerous bugfixes and optimizations