diff --git a/Makefile b/Makefile
index 125db1b1eb..65a950dfab 100644
--- a/Makefile
+++ b/Makefile
@@ -133,6 +133,9 @@ test-with-oracle-all: test-launch-oracle
 docs-serve:
 	cd docs;make livehtml
 
+docs-spellcheck:
+
+	sphinx-build -b spelling -d docs/_build/ docs docs/_build/spelling
 
 # Translations
 
diff --git a/docs/conf.py b/docs/conf.py
index 6a15fcbb36..519c7e28a2 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -33,7 +33,7 @@ sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "_ext"))
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 #extensions = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode']
 #extensions = ["djangodocs", "sphinx.ext.intersphinx"]
-extensions = ['sphinxcontrib.blockdiag']
+extensions = ['sphinxcontrib.blockdiag', 'sphinxcontrib.spelling']
 
 blockdiag_antialias = True
 blockdiag_html_image_format = "SVG"
diff --git a/docs/spelling_wordlist.txt b/docs/spelling_wordlist.txt
new file mode 100644
index 0000000000..8d9cc860d2
--- /dev/null
+++ b/docs/spelling_wordlist.txt
@@ -0,0 +1,19 @@
+MERC
+Django
+Tesseract
+backend
+minified
+phpBB
+Grappelli
+unoconv
+Sergey
+Glita
+fabfile
+poppler
+Transifex
+pdftotext
+frontend
+Redis
+backend
+Kombu
+filesystem
diff --git a/requirements/documentation.txt b/requirements/documentation.txt
index 70323dcf71..ad1e80067c 100644
--- a/requirements/documentation.txt
+++ b/requirements/documentation.txt
@@ -3,3 +3,4 @@ Sphinx==1.7.1
 sphinx-autobuild==0.7.1
 sphinx_rtd_theme==0.2.4
 sphinxcontrib-blockdiag==1.5.5
+sphinxcontrib-spelling==4.2.0