diff --git a/Client/TeamTalkClassic/AppInfo.h b/Client/TeamTalkClassic/AppInfo.h
index 9581c425f6..48787a7e24 100644
--- a/Client/TeamTalkClassic/AppInfo.h
+++ b/Client/TeamTalkClassic/AppInfo.h
@@ -25,7 +25,7 @@
 
 #define COMPANYNAME             _T("BearWare.dk")
 #define APPVERSION_SHORT        _T("5.11.0")
-#define APPVERSION              _T( TEAMTALK_VERSION ) _T(" - Unreleased")
+#define APPVERSION              _T( "5.11" ) _T("")
 
 #define APPTITLE                _T("TeamTalk 5 Classic v. ") APPVERSION
 #define APPNAME                 _T("TeamTalk 5 Classic")
diff --git a/Client/TeamTalkClassic/TeamTalk.rc b/Client/TeamTalkClassic/TeamTalk.rc
index f30634ee80..634abcb0f0 100644
--- a/Client/TeamTalkClassic/TeamTalk.rc
+++ b/Client/TeamTalkClassic/TeamTalk.rc
@@ -1540,8 +1540,8 @@ IDR_MAINFRAME           ICON                    "res\\TeamTalk.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,11,0,5098
- PRODUCTVERSION 5,11,0,5098
+ FILEVERSION 5,11,0,5099
+ PRODUCTVERSION 5,11,0,5099
  FILEFLAGSMASK 0x1fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -1558,12 +1558,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "BearWare.dk"
             VALUE "FileDescription", "TeamTalk voice conferencing client"
-            VALUE "FileVersion", "5, 11, 0, 5098"
+            VALUE "FileVersion", "5, 11, 0, 5099"
             VALUE "InternalName", "TeamTalk5.exe"
             VALUE "LegalCopyright", "Copyright (c) 2005-2020, BearWare.dk.  All rights reserved."
             VALUE "OriginalFilename", "TeamTalk5.exe"
             VALUE "ProductName", "BearWare.dk TeamTalk"
-            VALUE "ProductVersion", "5, 11, 0, 5098"
+            VALUE "ProductVersion", "5, 11, 0, 5099"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Client/qtTeamTalk/appinfo.h b/Client/qtTeamTalk/appinfo.h
index cd305d9997..adeb6f3e2a 100644
--- a/Client/qtTeamTalk/appinfo.h
+++ b/Client/qtTeamTalk/appinfo.h
@@ -31,8 +31,8 @@
 
 #define COMPANYNAME         "BearWare.dk"
 #define APPVERSION_SHORT    "5.11.0"
-#define APPVERSION_POSTFIX  " - Unreleased"
-#define APPVERSION          TEAMTALK_VERSION APPVERSION_POSTFIX
+#define APPVERSION_POSTFIX  ""
+#define APPVERSION          "5.11" APPVERSION_POSTFIX
 
 #define APPICON             QString::fromUtf8(":/images/images/teamtalk.png")
 #define APPTRAYICON         QString::fromUtf8(":/images/images/teamtalky.png")
diff --git a/Client/qtTeamTalk/mainwindow.rc b/Client/qtTeamTalk/mainwindow.rc
index 2b2af8aa6b..ae40c8e98b 100644
--- a/Client/qtTeamTalk/mainwindow.rc
+++ b/Client/qtTeamTalk/mainwindow.rc
@@ -53,8 +53,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,11,0,5098
- PRODUCTVERSION 5,11,0,5098
+ FILEVERSION 5,11,0,5099
+ PRODUCTVERSION 5,11,0,5099
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -71,12 +71,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "BearWare.dk"
             VALUE "FileDescription", "TeamTalk Conferencing Client"
-            VALUE "FileVersion", "5, 11, 0, 5098"
+            VALUE "FileVersion", "5, 11, 0, 5099"
             VALUE "InternalName", "TeamTalk 5"
             VALUE "LegalCopyright", "Copyright (c) 2005-2020, BearWare.dk.  All rights reserved."
             VALUE "OriginalFilename", "TeamTalk5.exe"
             VALUE "ProductName", "BearWare.dk TeamTalk 5"
-            VALUE "ProductVersion", "5, 11, 0, 5098"
+            VALUE "ProductVersion", "5, 11, 0, 5099"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Documentation/TeamTalk/TeamTalk5.dox b/Documentation/TeamTalk/TeamTalk5.dox
index ba985944c6..04b4d1a5ee 100644
--- a/Documentation/TeamTalk/TeamTalk5.dox
+++ b/Documentation/TeamTalk/TeamTalk5.dox
@@ -48,7 +48,7 @@ PROJECT_NAME           = "TeamTalk Help"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER = "Version 5.11.0.5098"
+PROJECT_NUMBER = "Version 5.11.0.5099"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/Documentation/TeamTalkSDK/TeamTalk.Java.dox b/Documentation/TeamTalkSDK/TeamTalk.Java.dox
index 278178f9ea..87ce808e22 100644
--- a/Documentation/TeamTalkSDK/TeamTalk.Java.dox
+++ b/Documentation/TeamTalkSDK/TeamTalk.Java.dox
@@ -48,7 +48,7 @@ PROJECT_NAME           = "TeamTalk 5 Java DLL"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER = "Version 5.11.0.5098 - Unreleased"
+PROJECT_NUMBER = "Version 5.11A"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/Documentation/TeamTalkSDK/TeamTalk.NET.dox b/Documentation/TeamTalkSDK/TeamTalk.NET.dox
index 7972335944..807456e034 100644
--- a/Documentation/TeamTalkSDK/TeamTalk.NET.dox
+++ b/Documentation/TeamTalkSDK/TeamTalk.NET.dox
@@ -48,7 +48,7 @@ PROJECT_NAME           = "TeamTalk 5 .NET DLL"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER = "Version 5.11.0.5098 - Unreleased"
+PROJECT_NUMBER = "Version 5.11A"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/Documentation/TeamTalkSDK/TeamTalk.dox b/Documentation/TeamTalkSDK/TeamTalk.dox
index f9e3731592..83b96b8e58 100644
--- a/Documentation/TeamTalkSDK/TeamTalk.dox
+++ b/Documentation/TeamTalkSDK/TeamTalk.dox
@@ -48,7 +48,7 @@ PROJECT_NAME           = "TeamTalk 5 C-API DLL"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER = "Version 5.11.0.5098 - Unreleased"
+PROJECT_NUMBER = "Version 5.11A"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/Library/TeamTalk.NET/AssemblyInfo.cs b/Library/TeamTalk.NET/AssemblyInfo.cs
index 217d19c532..78b965f76c 100644
--- a/Library/TeamTalk.NET/AssemblyInfo.cs
+++ b/Library/TeamTalk.NET/AssemblyInfo.cs
@@ -58,5 +58,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("5.11.0.5098")]
+[assembly: AssemblyVersion("5.11.0.5099")]
 
diff --git a/Library/TeamTalkLib/TeamTalkDefs.h b/Library/TeamTalkLib/TeamTalkDefs.h
index 87da4f87e9..5e32518c7c 100644
--- a/Library/TeamTalkLib/TeamTalkDefs.h
+++ b/Library/TeamTalkLib/TeamTalkDefs.h
@@ -24,10 +24,10 @@
 #if !defined(TEAMTALKDEFS_H)
 #define TEAMTALKDEFS_H
 
-#define TEAMTALK_VERSION            "5.11.0.5098"
-#define TEAMTALK_RC_VERSION         5,11,0,5098
-#define TEAMTALK_RC_FILEVERSION     "5, 11, 0, 5098"
-#define TEAMTALK_VERSION_POSTFIX    " - Unreleased"
+#define TEAMTALK_VERSION            "5.11.0.5099"
+#define TEAMTALK_RC_VERSION         5,11,0,5099
+#define TEAMTALK_RC_FILEVERSION     "5, 11, 0, 5099"
+#define TEAMTALK_VERSION_POSTFIX    ""
 
 #if defined(ENABLE_TEAMTALKPRO)
 #define TEAMTALK_LIB_NAME "TeamTalk5Pro"
diff --git a/Library/TeamTalkLib/bin/ttsrv/ttsrv.rc b/Library/TeamTalkLib/bin/ttsrv/ttsrv.rc
index dd5d87bf22..cd3a8b84df 100644
--- a/Library/TeamTalkLib/bin/ttsrv/ttsrv.rc
+++ b/Library/TeamTalkLib/bin/ttsrv/ttsrv.rc
@@ -71,8 +71,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,11,0,5098
- PRODUCTVERSION 5,11,0,5098
+ FILEVERSION 5,11,0,5099
+ PRODUCTVERSION 5,11,0,5099
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -93,7 +93,7 @@ BEGIN
 #else
             VALUE "FileDescription", "TeamTalk Conferencing Server"
 #endif
-            VALUE "FileVersion", "5, 11, 0, 5098"
+            VALUE "FileVersion", "5, 11, 0, 5099"
             VALUE "InternalName", "tt5srv.exe"
             VALUE "LegalCopyright", "Copyright (c) 2002-2020, BearWare.dk.  All rights reserved."
             VALUE "OriginalFilename", "tt5srv.exe"
@@ -102,7 +102,7 @@ BEGIN
 #else
             VALUE "ProductName", "TeamTalk Conferencing Server"
 #endif
-            VALUE "ProductVersion", "5, 11, 0, 5098"
+            VALUE "ProductVersion", "5, 11, 0, 5099"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Library/TeamTalk_DLL/TeamTalk.h b/Library/TeamTalk_DLL/TeamTalk.h
index 32836c7044..fbbbae5a48 100644
--- a/Library/TeamTalk_DLL/TeamTalk.h
+++ b/Library/TeamTalk_DLL/TeamTalk.h
@@ -16,7 +16,7 @@
  * client's version can be seen in the @a szVersion member of the
  * #User-struct. */
 
-#define TEAMTALK_VERSION "5.11.0.5098"
+#define TEAMTALK_VERSION "5.11.0.5099"
 
 
 #if defined(WIN32)
diff --git a/Library/TeamTalk_DLL/TeamTalkSrv.h b/Library/TeamTalk_DLL/TeamTalkSrv.h
index f3d19bbb4e..2b8529ab8f 100644
--- a/Library/TeamTalk_DLL/TeamTalkSrv.h
+++ b/Library/TeamTalk_DLL/TeamTalkSrv.h
@@ -18,7 +18,7 @@
  * client's version can be seen in the @a szVersion member of the
  * #User-struct. */
 
-#define TEAMTALK_SERVER_VERSION "5.11.0.5098"
+#define TEAMTALK_SERVER_VERSION "5.11.0.5099"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Setup/Installer/Windows/TeamTalk5.iss b/Setup/Installer/Windows/TeamTalk5.iss
index d462e83ec3..cb13884630 100644
--- a/Setup/Installer/Windows/TeamTalk5.iss
+++ b/Setup/Installer/Windows/TeamTalk5.iss
@@ -11,7 +11,7 @@ AppUpdatesURL=http://www.bearware.dk
 DefaultDirName={pf}\TeamTalk5
 DefaultGroupName=TeamTalk 5
 AllowNoIcons=yes
-OutputBaseFilename=TeamTalk_v5.11.0.5098_Setup
+OutputBaseFilename=TeamTalk_v5.11_Setup
 SetupIconFile=c:\tt5dist\TeamTalk5_x64\TeamTalk5\Client\qtTeamTalk\images\teamtalk.ico
 Compression=lzma/ultra64
 SolidCompression=yes
diff --git a/Setup/Portable/Makefile b/Setup/Portable/Makefile
index ae384053d9..2745c7c806 100644
--- a/Setup/Portable/Makefile
+++ b/Setup/Portable/Makefile
@@ -1,4 +1,4 @@
-VERSION="v5.11.0.5098"
+VERSION="v5.11"
 
 OUTPUT_DEST=./
 INSTALLDIR?=$(TEAMTALK_INSTALLDIR)