diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml
index ed4fe99d8..53ff92d93 100644
--- a/.github/workflows/snap.yml
+++ b/.github/workflows/snap.yml
@@ -47,10 +47,6 @@ jobs:
           md5cache=$(md5sum CMAKE_CACHE_KEY.txt | cut -c -32)
           echo ::set-env name=CMAKE_CACHE_KEY::$md5cache
 
-          awk -v RS="" -v ORS="\n\n" '/^  enchant:/' snap/snapcraft.yaml > ENCHANT_CACHE_KEY.txt
-          md5cache=$(md5sum ENCHANT_CACHE_KEY.txt | cut -c -32)
-          echo ::set-env name=ENCHANT_CACHE_KEY::$md5cache
-
       - name: CMake cache.
         id: cache-cmake
         uses: actions/cache@v1
@@ -62,17 +58,6 @@ jobs:
         if: steps.cache-cmake.outputs.cache-hit != 'true'
         run: snapcraft build --destructive-mode cmake
 
-      - name: Enchant cache.
-        id: cache-enchant
-        uses: actions/cache@v1
-        with:
-          path: parts/enchant
-          key: ${{ runner.OS }}-enchant-${{ env.CACHE_KEY }}-${{ env.ENCHANT_CACHE_KEY }}
-
-      - name: Enchant build.
-        if: steps.cache-enchant.outputs.cache-hit != 'true'
-        run: snapcraft build --destructive-mode enchant
-
       - name: Telegram Desktop snap build.
         if: env.ONLY_CACHE == 'false'
         run: snapcraft --destructive-mode
@@ -95,5 +80,5 @@ jobs:
 
       - name: Remove unneeded directories for cache.
         run: |
-          rm -rf parts/{cmake,enchant}/{build,src,ubuntu}
-          rm -rf parts/{cmake,enchant}/state/{stage,prime}
+          rm -rf parts/cmake/{build,src,ubuntu}
+          rm -rf parts/cmake/state/{stage,prime}
diff --git a/cmake b/cmake
index 0c4fe1750..81e27ccc0 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 0c4fe1750f232805f604048340d64bd1a6a18a74
+Subproject commit 81e27ccc0e7bf27405569ce98582860dfc9ea9bb
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index cb1d604ea..62a4f41c6 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -62,6 +62,7 @@ parts:
       - libswscale-dev
       - libswresample-dev
       - libdbusmenu-qt5-dev
+      - libhunspell-dev
       - liblz4-dev
       - liblzma-dev
       - libminizip-dev
@@ -79,6 +80,7 @@ parts:
       - libswscale4
       - libswresample2
       - libdbusmenu-qt5-2
+      - libhunspell-1.6-0
       - liblz4-1
       - liblzma5
       - libminizip1
@@ -117,26 +119,9 @@ parts:
     after:
       - cmake
       - desktop-qt5
-      - enchant
       - range-v3
       - xxhash
 
-  spellchecking:
-    plugin: nil
-    stage-packages:
-      - hunspell-de-de
-      - hunspell-en-au
-      - hunspell-en-ca
-      - hunspell-en-gb
-      - hunspell-en-us
-      - hunspell-en-za
-      - hunspell-fr-classical
-      - hunspell-it
-      - hunspell-pl
-      - hunspell-es
-      - hunspell-pt-br
-      - hunspell-pt-pt
-
   desktop-qt5:
     source: https://github.com/ubuntu/snapcraft-desktop-helpers.git
     source-subdir: qt
@@ -191,22 +176,6 @@ parts:
       - libtinfo5
     prime: [-./*]
 
-  enchant:
-    source: https://github.com/AbiWord/enchant.git
-    source-depth: 1
-    source-tag: v2.2.7
-    plugin: autotools
-    build-packages:
-      - libltdl-dev
-      - libglib2.0-dev
-      - libhunspell-dev
-    stage-packages:
-      - libglib2.0-0
-      - libhunspell-1.6-0
-    configflags:
-      - --enable-relocatable
-    prime: [-./bin/*]
-
   range-v3:
     source: https://github.com/ericniebler/range-v3.git
     source-depth: 1