diff --git a/Setup/UZBuilder_setup.iss b/Setup/UZBuilder_setup.iss
index f77e552c..1eb806e9 100644
--- a/Setup/UZBuilder_setup.iss
+++ b/Setup/UZBuilder_setup.iss
@@ -6,7 +6,9 @@
 
 #define UZB_arch "x64"
 #define UZB_GetVersionString() \
-  Local[0] = GetVersionNumbersString("..\Build\Builder.exe")        
+  Local[0] = GetVersionNumbersString("..\Build\Builder.exe")     
+#define UZB_GetVersionInfo() \
+  Local[0] = GetStringFileInfo("..\Build\Builder.exe", PRODUCT_VERSION)    
 #define UZB_GetVersion() \
    GetVersionComponents("..\Build\Builder.exe", \
        Local[0], Local[1], Local[2], Local[3]), \
@@ -20,7 +22,7 @@
 
 [Setup]
 AppName=Ultimate Zone Builder
-AppVerName=Ultimate Zone Builder {#UZB_GetVersionString} ({#UZB_arch})   
+AppVerName=Ultimate Zone Builder {#UZB_GetVersionInfo} ({#UZB_arch})   
 VersionInfoVersion={#UZB_GetVersionString}
 AppPublisher=Sonic Team Junior
 AppPublisherURL=https://www.srb2.org/
@@ -31,7 +33,7 @@ DefaultGroupName=Ultimate Zone Builder
 AllowNoIcons=true
 LicenseFile=..\LICENSE.txt
 OutputDir=..\Release
-OutputBaseFilename="UZBuilder v{#UZB_GetVersion} Setup ({#UZB_bit})"
+OutputBaseFilename="UZBuilder v{#UZB_GetVersionInfo} Setup ({#UZB_bit})"
 Compression=lzma/ultra64
 SolidCompression=true
 SourceDir=..\Build
diff --git a/Source/Core/Properties/AssemblyInfo.cs b/Source/Core/Properties/AssemblyInfo.cs
index 61247bc0..b0852757 100755
--- a/Source/Core/Properties/AssemblyInfo.cs
+++ b/Source/Core/Properties/AssemblyInfo.cs
@@ -30,5 +30,6 @@ using CodeImp.DoomBuilder;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.0.4171")]
+[assembly: AssemblyVersion("0.9.0.4173")]
+[assembly: AssemblyInformationalVersion("0.9")]
 [assembly: NeutralResourcesLanguageAttribute("en")]
diff --git a/Source/Core/Windows/MainForm.cs b/Source/Core/Windows/MainForm.cs
index e19e9027..5e904697 100755
--- a/Source/Core/Windows/MainForm.cs
+++ b/Source/Core/Windows/MainForm.cs
@@ -432,7 +432,7 @@ namespace CodeImp.DoomBuilder.Windows
 		//mxd
 		private void UpdateTitle()
 		{
-			string programname = this.Text = Application.ProductName + " v" + General.ThisAssembly.GetName().Version.Major + "." + General.ThisAssembly.GetName().Version.Minor;
+			string programname = this.Text = Application.ProductName + " v" + FileVersionInfo.GetVersionInfo(General.ThisAssembly.Location).ProductVersion;
 			if (Environment.Is64BitProcess)
                 programname += " (64-bit)";
             else programname += " (32-bit)";
@@ -1585,45 +1585,45 @@ namespace CodeImp.DoomBuilder.Windows
 
 				// Make the new items list
 				List<ToolStripItem> items = new List<ToolStripItem>(General.Map.Config.Skills.Count * 2 + General.Map.ConfigSettings.TestEngines.Count + 2);
-				
+
 				// Positive skills are with monsters
 
 				if (General.Map.Config.Skills.Count > 0)
 				{ 
 					foreach (SkillInfo si in General.Map.Config.Skills)
-				{
-					ToolStripMenuItem menuitem = new ToolStripMenuItem(si.ToString());
-					menuitem.Image = Resources.Monster2;
-					menuitem.Click += TestSkill_Click;
-					menuitem.Tag = si.Index;
-					menuitem.Checked = (General.Settings.TestMonsters && (General.Map.ConfigSettings.TestSkill == si.Index));
-					items.Add(menuitem);
+					{
+						ToolStripMenuItem menuitem = new ToolStripMenuItem(si.ToString());
+						menuitem.Image = Resources.Monster2;
+						menuitem.Click += TestSkill_Click;
+						menuitem.Tag = si.Index;
+						menuitem.Checked = (General.Settings.TestMonsters && (General.Map.ConfigSettings.TestSkill == si.Index));
+						items.Add(menuitem);
 
-					int width = (int)MeasureString(si.ToString(), menuitem.Font).Width;
-					if (width > maxwidth)
-						maxwidth = width;
-				}
+						int width = (int)MeasureString(si.ToString(), menuitem.Font).Width;
+						if (width > maxwidth)
+							maxwidth = width;
+					}
 
-				// Add separator
-				items.Add(new ToolStripSeparator { Padding = new Padding(0, 3, 0, 3) });
+					// Add separator
+					items.Add(new ToolStripSeparator { Padding = new Padding(0, 3, 0, 3) });
 
-				// Negative skills are without monsters
+					// Negative skills are without monsters
 					foreach (SkillInfo si in General.Map.Config.Skills)
-				{
-					ToolStripMenuItem menuitem = new ToolStripMenuItem(si.ToString());
-					menuitem.Image = Resources.Monster3;
-					menuitem.Click += TestSkill_Click;
-					menuitem.Tag = -si.Index;
-					menuitem.Checked = (!General.Settings.TestMonsters && (General.Map.ConfigSettings.TestSkill == si.Index));
-					items.Add(menuitem);
+					{
+						ToolStripMenuItem menuitem = new ToolStripMenuItem(si.ToString());
+						menuitem.Image = Resources.Monster3;
+						menuitem.Click += TestSkill_Click;
+						menuitem.Tag = -si.Index;
+						menuitem.Checked = (!General.Settings.TestMonsters && (General.Map.ConfigSettings.TestSkill == si.Index));
+						items.Add(menuitem);
 
-					int width = (int)MeasureString(si.ToString(), menuitem.Font).Width;
-					if (width > maxwidth)
-						maxwidth = width;
-				}
+						int width = (int)MeasureString(si.ToString(), menuitem.Font).Width;
+						if (width > maxwidth)
+							maxwidth = width;
+					}
 
-				//mxd. Add separator
-				items.Add(new ToolStripSeparator { Padding = new Padding(0, 3, 0, 3) });
+					//mxd. Add separator
+					items.Add(new ToolStripSeparator { Padding = new Padding(0, 3, 0, 3) });
 				}
 
 				//mxd. Add test engines
diff --git a/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs b/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs
index 308f6deb..8858889b 100755
--- a/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs
+++ b/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Resources;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.0.0.4171")]
+[assembly: AssemblyVersion("1.0.0.4173")]
 [assembly: NeutralResourcesLanguageAttribute("en")]