diff --git a/src/Lithnet.ResourceManagement.Automation/Lithnet.ResourceManagement.Automation.csproj b/src/Lithnet.ResourceManagement.Automation/Lithnet.ResourceManagement.Automation.csproj
index 577348e..347d1ab 100644
--- a/src/Lithnet.ResourceManagement.Automation/Lithnet.ResourceManagement.Automation.csproj
+++ b/src/Lithnet.ResourceManagement.Automation/Lithnet.ResourceManagement.Automation.csproj
@@ -117,8 +117,34 @@
     </None>
     <None Include="packages.config" />
   </ItemGroup>
+  <UsingTask TaskName="ReplaceFileText" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
+    <ParameterGroup>
+      <InputFilename ParameterType="System.String" Required="true" />
+      <OutputFilename ParameterType="System.String" Required="true" />
+      <MatchExpression ParameterType="System.String" Required="true" />
+      <ReplacementText ParameterType="System.String" Required="true" />
+    </ParameterGroup>
+    <Task>
+      <Reference Include="System.Core" />
+      <Using Namespace="System" />
+      <Using Namespace="System.IO" />
+      <Using Namespace="System.Text.RegularExpressions" />
+      <Code Type="Fragment" Language="cs">
+        <![CDATA[
+            File.WriteAllText(
+                OutputFilename,
+                Regex.Replace(File.ReadAllText(InputFilename), MatchExpression, ReplacementText)
+                );
+          ]]>
+      </Code>
+    </Task>
+  </UsingTask>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
+    <PostBuildEventDependsOn>
+      $(PostBuildEventDependsOn);
+      PostBuildMacros;
+    </PostBuildEventDependsOn>
     <PostBuildEvent>"C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe" sign /sha1 "$(CSCERTTHUMBPRINT)" /t http://timestamp.digicert.com /fd sha256 /v "$(TargetFileName)"
 
 "C:\Program Files\Debugging Tools for Windows (x64)\symstore" add /f "$(TargetDir)*.pdb" /s \\localhost\symbols /t "$(ProjectName)" /v "@(VersionNumber)"
@@ -129,12 +155,24 @@
     </PreBuildEvent>
   </PropertyGroup>
   <Import Project="..\packages\Fody.1.29.2\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.1.29.2\build\dotnet\Fody.targets')" />
+  <Target Name="PostBuildMacros">
+    <GetAssemblyIdentity AssemblyFiles="$(TargetPath)">
+      <Output TaskParameter="Assemblies" ItemName="Targets" />
+    </GetAssemblyIdentity>
+    <ItemGroup>
+      <VersionNumber Include="@(Targets->'%(Version)')" />
+    </ItemGroup>
+  </Target>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\Fody.1.29.2\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.2\build\dotnet\Fody.targets'))" />
   </Target>
+  <Target Name="AfterBuild">
+    <ReplaceFileText InputFilename="$(TargetDir)LithnetRMA.psd1" OutputFilename="$(TargetDir)LithnetRMA.psd1" MatchExpression="\$version\$" ReplacementText="@(VersionNumber)" />
+    <ReplaceFileText InputFilename="$(ProjectDir)LithnetRMA.Help.pshproj" OutputFilename="$(ProjectDir)LithnetRMA.Help.pshproj" MatchExpression="&lt;Version&gt;.*?&lt;\/Version&gt;" ReplacementText="&lt;Version&gt;@(VersionNumber)&lt;/Version&gt;" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/Lithnet.ResourceManagement.Automation/LithnetRMA.Help.pshproj b/src/Lithnet.ResourceManagement.Automation/LithnetRMA.Help.pshproj
index f433e9a..fc02aca 100644
--- a/src/Lithnet.ResourceManagement.Automation/LithnetRMA.Help.pshproj
+++ b/src/Lithnet.ResourceManagement.Automation/LithnetRMA.Help.pshproj
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <ModuleObject xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" fVersion="1.1" type="Manifest" mclass="Module" useSupports="false">
   <Name>LithnetRMA</Name>
-  <Version>1.0.6596</Version>
+  <Version>1.0.6597.17047</Version>
   <Description>Lithnet Resource Management Client for PowerShell</Description>
   <HasManifest>true</HasManifest>
   <OverridePostCount>false</OverridePostCount>
diff --git a/src/Lithnet.ResourceManagement.Automation/LithnetRMA.psd1 b/src/Lithnet.ResourceManagement.Automation/LithnetRMA.psd1
index 0fbe7c6..eb397da 100644
--- a/src/Lithnet.ResourceManagement.Automation/LithnetRMA.psd1
+++ b/src/Lithnet.ResourceManagement.Automation/LithnetRMA.psd1
@@ -9,7 +9,7 @@
 @{
 
 # Version number of this module.
-ModuleVersion = '1.0.6596'
+ModuleVersion = '$version$'
 
 # ID used to uniquely identify this module
 GUID = 'd7c36446-aca6-418a-a2a3-cbfc32016a52'