diff --git a/.gitmodules b/.gitmodules
index b96eac1b5..9b02ad897 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -64,3 +64,6 @@
 [submodule "Telegram/ThirdParty/libdbusmenu-qt"]
 	path = Telegram/ThirdParty/libdbusmenu-qt
 	url = https://github.com/desktop-app/libdbusmenu-qt.git
+[submodule "Telegram/ThirdParty/hunspell"]
+	path = Telegram/ThirdParty/hunspell
+	url = https://github.com/hunspell/hunspell
diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 98c142c95..5ed03a652 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -85,6 +85,10 @@ if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
     )
 endif()
 
+if (add_hunspell_library)
+    target_link_libraries(Telegram PRIVATE desktop-app::external_hunspell)
+endif()
+
 target_link_libraries(Telegram
 PRIVATE
     tdesktop::lib_mtproto
diff --git a/Telegram/ThirdParty/hunspell b/Telegram/ThirdParty/hunspell
new file mode 160000
index 000000000..8c773334f
--- /dev/null
+++ b/Telegram/ThirdParty/hunspell
@@ -0,0 +1 @@
+Subproject commit 8c773334f314201b79bd8a6d40369ada9d7056d4
diff --git a/cmake b/cmake
index 99278254e..6dd044ae1 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 99278254e352029ce36dc7b597b346b245d9860c
+Subproject commit 6dd044ae163bc67a7f0f0dbf6a2fa28b633b5fdf