diff --git a/MANIFEST.in b/MANIFEST.in
index 38f115085..02a707cf3 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,5 @@
 include README.rst COPYING requirements.txt
 recursive-include modoboa *.html *.js *.css *.png *.po *.mo *.json *.gif
 recursive-include modoboa/core/templates *.tpl
-recursive-include doc *
\ No newline at end of file
+recursive-include modoboa/core/commands/templates *.tpl
+recursive-include doc *
diff --git a/modoboa/core/commands/__init__.py b/modoboa/core/commands/__init__.py
index e7ef1ae9e..9b2b1c9f2 100644
--- a/modoboa/core/commands/__init__.py
+++ b/modoboa/core/commands/__init__.py
@@ -19,7 +19,7 @@ class Command(object):
         self._verbose = verbose
         if not settings.configured:
             settings.configure()
-        self._templates_dir = "%s/commands/templates" % os.path.dirname(__file__)
+        self._templates_dir = "%s/templates" % os.path.dirname(__file__)
 
     def _render_template(self, tplfile, env):
         fp = open(tplfile)