diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
index 30e66c408..d860a75f0 100644
--- a/.github/workflows/win.yml
+++ b/.github/workflows/win.yml
@@ -259,12 +259,16 @@ jobs:
       - name: Opus.
         if: steps.cache-opus.outputs.cache-hit != 'true'
         run: |
-          git clone %GIT%/telegramdesktop/opus.git
+          git clone -b v1.3.1 %GIT%/xiph/opus.git
           cd opus
-          git checkout tdesktop
-          cd win32\VS2015
-          msbuild -m opus.sln /property:Configuration=Debug /property:Platform="Win32"
-          msbuild -m opus.sln /property:Configuration=Release /property:Platform="Win32"
+          cmake -B out . ^
+          -A Win32 ^
+          -DCMAKE_INSTALL_PREFIX=%LibrariesPath%/local/opus ^
+          -DCMAKE_C_FLAGS_DEBUG="/MTd /Zi /Ob0 /Od /RTC1" ^
+          -DCMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG"
+          cmake --build out --config Debug
+          cmake --build out --config Release
+          cmake --install out --config Release
 
       - name: Rnnoise.
         run: |
diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index 714eb0bc9..bcd6aaedc 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -379,7 +379,7 @@ def runStages():
 stage('patches', """
     git clone https://github.com/desktop-app/patches.git
     cd patches
-    git checkout 9d2a07ba8b
+    git checkout 52e847920f
 """)
 
 stage('depot_tools', """
@@ -499,13 +499,18 @@ mac:
 """)
 
 stage('opus', """
-    git clone -b td-v1.3.1 https://github.com/telegramdesktop/opus.git
+    git clone -b v1.3.1 https://github.com/xiph/opus.git
     cd opus
 win:
-    cd win32\\VS2015
-    msbuild opus.sln /property:Configuration=Debug /property:Platform="%WIN32X64%"
+    cmake -B out . ^
+        -A %WIN32X64% ^
+        -DCMAKE_INSTALL_PREFIX=%LIBS_DIR%/local/opus ^
+        -DCMAKE_C_FLAGS_DEBUG="/MTd /Zi /Ob0 /Od /RTC1" ^
+        -DCMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG"
+    cmake --build out --config Debug
 release:
-    msbuild opus.sln /property:Configuration=Release /property:Platform="%WIN32X64%"
+    cmake --build out --config Release
+    cmake --install out --config Release
 mac:
     ./autogen.sh
     CFLAGS="$MIN_VER $UNGUARDED" CPPFLAGS="$MIN_VER $UNGUARDED" LDFLAGS="$MIN_VER" ./configure --prefix=$USED_PREFIX
diff --git a/cmake b/cmake
index dbc1e4fb3..1dacc0ac4 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit dbc1e4fb358faeda2abec4f32336eab1d7552922
+Subproject commit 1dacc0ac4fe2a5cb0237e7c89fe5dd8906e1593f