diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index e26c85c2d4..0ba284015f 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -473,7 +473,14 @@ win:
     del msys64.exe
 
     bash -c "pacman-key --init; pacman-key --populate; pacman -Syu --noconfirm"
-    pacman -Syu --noconfirm mingw-w64-x86_64-perl mingw-w64-x86_64-nasm mingw-w64-x86_64-yasm mingw-w64-x86_64-ninja msys/make diffutils pkg-config
+    pacman -Syu --noconfirm ^
+        make ^
+        mingw-w64-x86_64-diffutils ^
+        mingw-w64-x86_64-gperf ^
+        mingw-w64-x86_64-nasm ^
+        mingw-w64-x86_64-perl ^
+        mingw-w64-x86_64-pkgconf ^
+        mingw-w64-x86_64-yasm
 
     SET PATH=%PATH_BACKUP_%
 """, 'ThirdParty')
@@ -1941,7 +1948,6 @@ win:
         -DOPENSSL_FOUND=1 ^
         -DOPENSSL_INCLUDE_DIR=%OPENSSL_DIR%\\include ^
         -DOPENSSL_CRYPTO_LIBRARY="%OPENSSL_LIBS_DIR%.dbg\\libcrypto.lib" ^
-        -DGPERF_EXECUTABLE=%ROOT_DIR%\\ThirdParty\\gperf\\bin\\gperf ^
         -DZLIB_FOUND=1 ^
         -DZLIB_INCLUDE_DIR=%ZLIB_LIBS_DIR% ^
         -DZLIB_LIBRARIES="%ZLIB_LIBS_DIR%\\Debug\\zlibstaticd.lib" ^
@@ -1960,7 +1966,6 @@ release:
         -DOPENSSL_FOUND=1 ^
         -DOPENSSL_INCLUDE_DIR=%OPENSSL_DIR%\\include ^
         -DOPENSSL_CRYPTO_LIBRARY="%OPENSSL_LIBS_DIR%\\libcrypto.lib" ^
-        -DGPERF_EXECUTABLE=%ROOT_DIR%\\ThirdParty\\gperf\\bin\\gperf ^
         -DZLIB_FOUND=1 ^
         -DZLIB_INCLUDE_DIR=%ZLIB_LIBS_DIR% ^
         -DZLIB_LIBRARIES="%ZLIB_LIBS_DIR%\\Release\\zlibstatic.lib" ^
diff --git a/Telegram/codegen b/Telegram/codegen
index 46545f547e..09f3535398 160000
--- a/Telegram/codegen
+++ b/Telegram/codegen
@@ -1 +1 @@
-Subproject commit 46545f547e75afa8500fc21b6e18d60ba3405cfa
+Subproject commit 09f353539861c5fe236e56c0bf97c01c469e4cbc
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index b715c0c79c..30a34e567f 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit b715c0c79c1035c060305c63fd60040ce4ec2941
+Subproject commit 30a34e567feae0af751d7f713d33a60497c673c2