diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 1f5ac3f65403e..a4f31f0a01c5a 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="5.8.3.0" />
+    Version="5.8.4.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 9ae851b64b576..cf8860b868d5f 100644
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -44,8 +44,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,8,3,0
- PRODUCTVERSION 5,8,3,0
+ FILEVERSION 5,8,4,0
+ PRODUCTVERSION 5,8,4,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "5.8.3.0"
+            VALUE "FileVersion", "5.8.4.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.8.3.0"
+            VALUE "ProductVersion", "5.8.4.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 93a1d4d8d2fbd..4900b9ac7553f 100644
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,8,3,0
- PRODUCTVERSION 5,8,3,0
+ FILEVERSION 5,8,4,0
+ PRODUCTVERSION 5,8,4,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "5.8.3.0"
+            VALUE "FileVersion", "5.8.4.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.8.3.0"
+            VALUE "ProductVersion", "5.8.4.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index e631de674d661..f117c4e1f578a 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs;
 constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs;
 constexpr auto AppName = "Telegram Desktop"_cs;
 constexpr auto AppFile = "Telegram"_cs;
-constexpr auto AppVersion = 5008003;
-constexpr auto AppVersionStr = "5.8.3";
-constexpr auto AppBetaVersion = false;
+constexpr auto AppVersion = 5008004;
+constexpr auto AppVersionStr = "5.8.4";
+constexpr auto AppBetaVersion = true;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 66fe3884c0833..591675ea87d2b 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         5008003
+AppVersion         5008004
 AppVersionStrMajor 5.8
-AppVersionStrSmall 5.8.3
-AppVersionStr      5.8.3
-BetaChannel        0
+AppVersionStrSmall 5.8.4
+AppVersionStr      5.8.4
+BetaChannel        1
 AlphaVersion       0
-AppVersionOriginal 5.8.3
+AppVersionOriginal 5.8.4.beta
diff --git a/changelog.txt b/changelog.txt
index 22c02f61234aa..1f57a0ab2bdd1 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,8 @@
+5.8.4 beta (28.11.24)
+
+- Add option to show folder tags in chats list.
+- Count group with topics as one chat in folder unread counter.
+
 5.8.3 (23.11.24)
 
 - Ctrl+Click on Reply in groups to reply in another chat.