diff --git a/MPF.Check/MPF.Check.csproj b/MPF.Check/MPF.Check.csproj
index 872fb667..70c38b89 100644
--- a/MPF.Check/MPF.Check.csproj
+++ b/MPF.Check/MPF.Check.csproj
@@ -11,12 +11,18 @@
     <Copyright>Copyright (c)2019-2021</Copyright>
     <RepositoryUrl>https://github.com/SabreTools/MPF</RepositoryUrl>
     <Version>1.18</Version>
-    <AssemblyVersion>1.18</AssemblyVersion>
-    <FileVersion>1.18</FileVersion>
+    <AssemblyVersion>$(Version)</AssemblyVersion>
+    <FileVersion>$(Version)</FileVersion>
     <IncludeSource>true</IncludeSource>
     <IncludeSymbols>true</IncludeSymbols>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <NrtRevisionFormat>$(Version)-{chash:8}</NrtRevisionFormat>
+    <NrtResolveSimpleAttributes>true</NrtResolveSimpleAttributes>
+    <NrtShowRevision>false</NrtShowRevision>
+  </PropertyGroup>
+
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
@@ -25,6 +31,7 @@
     <PackageReference Include="BurnOutSharp" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="1.6.0" GeneratePathProperty="true">
       <IncludeAssets>runtime; compile; build; native; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.0" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/MPF.Library/MPF.Library.csproj b/MPF.Library/MPF.Library.csproj
index ce2ddc0b..2254c921 100644
--- a/MPF.Library/MPF.Library.csproj
+++ b/MPF.Library/MPF.Library.csproj
@@ -9,13 +9,19 @@
     <Copyright>Copyright (c)2019-2021</Copyright>
     <RepositoryUrl>https://github.com/SabreTools/MPF</RepositoryUrl>
     <Version>1.18</Version>
-    <AssemblyVersion>1.18</AssemblyVersion>
-    <FileVersion>1.18</FileVersion>
+    <AssemblyVersion>$(Version)</AssemblyVersion>
+    <FileVersion>$(Version)</FileVersion>
     <IncludeSource>true</IncludeSource>
     <IncludeSymbols>true</IncludeSymbols>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <NrtRevisionFormat>$(Version)-{chash:8}</NrtRevisionFormat>
+    <NrtResolveSimpleAttributes>true</NrtResolveSimpleAttributes>
+    <NrtShowRevision>false</NrtShowRevision>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(TargetFramework)'!='netcoreapp3.1'">
     <DefineConstants>NET_FRAMEWORK</DefineConstants>
   </PropertyGroup>
@@ -73,6 +79,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="System.IO.Compression" Version="4.3.0" />
     <PackageReference Include="System.Management" Version="6.0.0-preview.3.21201.4" />
+    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.0" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/MPF.Library/Utilities/Tools.cs b/MPF.Library/Utilities/Tools.cs
index 41b7fcc7..763dc8fd 100644
--- a/MPF.Library/Utilities/Tools.cs
+++ b/MPF.Library/Utilities/Tools.cs
@@ -83,7 +83,8 @@ namespace MPF.Utilities
         public static (bool different, string message, string url) CheckForNewVersion()
         {
             // Get current assembly version
-            string version = GetCurrentVersion();
+            var assemblyVersion = Assembly.GetEntryAssembly().GetName().Version;
+            string version = $"{assemblyVersion.Major}.{assemblyVersion.Minor}" + (assemblyVersion.Build != 0 ? $".{assemblyVersion.Build}" : string.Empty);
 
             // Get the latest tag from GitHub
             using (var client = new RedumpWebClient())
@@ -102,12 +103,12 @@ namespace MPF.Utilities
         }
 
         /// <summary>
-        /// Get the current assembly version formatted as a string
+        /// Get the current informational version formatted as a string
         /// </summary>
-        private static string GetCurrentVersion()
+        public static string GetCurrentVersion()
         {
-            var assemblyVersion = Assembly.GetEntryAssembly().GetName().Version;
-            return $"{assemblyVersion.Major}.{assemblyVersion.Minor}" + (assemblyVersion.Build != 0 ? $".{assemblyVersion.Build}" : string.Empty);
+            var assemblyVersion = Attribute.GetCustomAttribute(Assembly.GetEntryAssembly(), typeof(AssemblyInformationalVersionAttribute)) as AssemblyInformationalVersionAttribute;
+            return assemblyVersion.InformationalVersion;
         }
 
         #endregion
diff --git a/MPF/MPF.csproj b/MPF/MPF.csproj
index 91cb6302..bcd4a8e9 100644
--- a/MPF/MPF.csproj
+++ b/MPF/MPF.csproj
@@ -14,17 +14,24 @@
     <Copyright>Copyright (c)2019-2021</Copyright>
     <RepositoryUrl>https://github.com/SabreTools/MPF</RepositoryUrl>
     <Version>1.18</Version>
-    <AssemblyVersion>1.18</AssemblyVersion>
-    <FileVersion>1.18</FileVersion>
+    <AssemblyVersion>$(Version)</AssemblyVersion>
+    <FileVersion>$(Version)</FileVersion>
     <IncludeSource>true</IncludeSource>
     <IncludeSymbols>true</IncludeSymbols>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <NrtRevisionFormat>$(Version)-{chash:8}</NrtRevisionFormat>
+    <NrtResolveSimpleAttributes>true</NrtResolveSimpleAttributes>
+    <NrtShowRevision>false</NrtShowRevision>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="BurnOutSharp" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="1.6.0" GeneratePathProperty="true">
       <IncludeAssets>runtime; compile; build; native; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0-preview.3.21201.4" />
+    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/MPF/Windows/MainWindow.xaml.cs b/MPF/Windows/MainWindow.xaml.cs
index 6a8b2b9f..fc4e2565 100644
--- a/MPF/Windows/MainWindow.xaml.cs
+++ b/MPF/Windows/MainWindow.xaml.cs
@@ -820,7 +820,9 @@ namespace MPF.Windows
                 + $"{Environment.NewLine}Supports DiscImageCreator, Aaru, and DD for Windows."
                 + $"{Environment.NewLine}Originally created to help the Redump project."
                 + $"{Environment.NewLine}"
-                + $"{Environment.NewLine}Thanks to everyone who has supported this project!";
+                + $"{Environment.NewLine}Thanks to everyone who has supported this project!"
+                + $"{Environment.NewLine}"
+                + $"{Environment.NewLine}Version {Tools.GetCurrentVersion()}";
 
             LogOutput.SecretLogLn(aboutText);
             MessageBox.Show(aboutText, "About", MessageBoxButton.OK, MessageBoxImage.Information);