diff --git a/Makefile b/Makefile
index 6fc4c2b25..2315518cb 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ PAPEROPT_a4     = -D latex_paper_size=a4
 PAPEROPT_letter = -D latex_paper_size=letter
 ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 # the i18n builder cannot share the environment and doctrees with the others
-I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) -t i18n .
 
 .PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest coverage gettext
 
@@ -161,9 +161,9 @@ info:
 	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
 
 gettext:
-	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
+	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) ../sphinx/templates
 	@echo
-	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
+	@echo "Build finished. The message catalogs are in ../sphinx/templates."
 
 changes:
 	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
diff --git a/conf.py b/conf.py
index 80e4fcade..a84a81d6f 100644
--- a/conf.py
+++ b/conf.py
@@ -96,7 +96,8 @@ latex_documents = [
 ]
 
 # -- I18n settings --------------------------------------------------------
-locale_dirs = ['locale/']
+
+locale_dirs = ['../sphinx/po/']
 gettext_compact = False
 # Exclude class reference when marked with tag i18n.
 if tags.has('i18n'):