diff --git a/.gitmodules b/.gitmodules
index b60bdb678d..f7ed642165 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -40,3 +40,6 @@
 [submodule "vendor/status-lib"]
 	path = vendor/status-lib
 	url = https://github.com/status-im/status-lib
+[submodule "spellchecking"]
+	path = spellchecking
+	url = https://github.com/status-im/desktop-spellchecking.git
diff --git a/Makefile b/Makefile
index cb1252775e..61a9d5413d 100644
--- a/Makefile
+++ b/Makefile
@@ -278,6 +278,8 @@ $(STATUS_CLIENT_APPIMAGE): nim_status_client $(APPIMAGE_TOOL) nim-status.desktop
 
 	# General Files
 	cp bin/nim_status_client tmp/linux/dist/usr/bin
+	mkdir -p tmp/linux/dist/usr/bin/dictionaries
+	cp -R spellchecking/dictionaries tmp/linux/dist/usr/bin/dictionaries
 	cp nim-status.desktop tmp/linux/dist/.
 	cp status.svg tmp/linux/dist/status.svg
 	cp status.svg tmp/linux/dist/usr/.
@@ -332,6 +334,7 @@ $(STATUS_CLIENT_DMG): nim_status_client $(DMG_TOOL)
 	mkdir -p $(MACOS_OUTER_BUNDLE)/Contents/Resources
 	cp Info.plist $(MACOS_OUTER_BUNDLE)/Contents/
 	cp bin/nim_status_client $(MACOS_OUTER_BUNDLE)/Contents/MacOS/
+	cp -R spellchecking/dictionaries $(MACOS_OUTER_BUNDLE)/Contents/MacOS/dictionaries
 	cp status.icns $(MACOS_OUTER_BUNDLE)/Contents/Resources/
 	cp status-macos.svg $(MACOS_OUTER_BUNDLE)/Contents/
 	cp -R resources.rcc $(MACOS_OUTER_BUNDLE)/Contents/
diff --git a/spellchecking b/spellchecking
new file mode 160000
index 0000000000..f1a88d1147
--- /dev/null
+++ b/spellchecking
@@ -0,0 +1 @@
+Subproject commit f1a88d11475f79e98ed9d0953599953ff31569ef