diff --git a/Setup/UZBuilder_setup.iss b/Setup/UZBuilder_setup.iss
index 4670ac2b97dd8c74ee1c34437d7c4c29499e982b..da1ae18362fc1b7ca3d7e62a7bd767af04c82dc4 100644
--- a/Setup/UZBuilder_setup.iss
+++ b/Setup/UZBuilder_setup.iss
@@ -6,7 +6,17 @@
 
 #define UZB_arch "x64"
 #define UZB_GetVersionString() \
-  Local[0] = GetVersionNumbersString("..\Build\Builder.exe")
+  Local[0] = GetVersionNumbersString("..\Build\Builder.exe")        
+#define UZB_GetVersion() \
+   GetVersionComponents("..\Build\Builder.exe", \
+       Local[0], Local[1], Local[2], Local[3]), \
+   Str(Local[0]) + "." + Str(Local[1])
+
+#if UZB_arch != "x86"
+  #define UZB_bit "64-bit"
+#else           
+  #define UZB_bit "32-bit"
+#endif
 
 [Setup]
 AppName=Ultimate Zone Builder
@@ -21,7 +31,7 @@ DefaultGroupName=Ultimate Zone Builder
 AllowNoIcons=true
 LicenseFile=..\LICENSE.txt
 OutputDir=..\Release
-OutputBaseFilename=Setup
+OutputBaseFilename="UZBuilder v{#UZB_GetVersion} 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 de2b89031aae7d26fd7023474e5725931dfe055b..52dbe2ce7618caf18b7d605aa1cd641d8037d8c1 100755
--- a/Source/Core/Properties/AssemblyInfo.cs
+++ b/Source/Core/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@ using CodeImp.DoomBuilder;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.3.0.4068")]
+[assembly: AssemblyVersion("0.4.0.4094")]
 [assembly: NeutralResourcesLanguageAttribute("en")]
diff --git a/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs b/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs
index 044c8cd42478fffab0aac9a90335926ccac6f86d..e5c78d9feb6fafb4f221bd3b8811163597cbb016 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.4068")]
+[assembly: AssemblyVersion("1.0.0.4094")]
 [assembly: NeutralResourcesLanguageAttribute("en")]