diff --git a/MANIFEST.in b/MANIFEST.in
index c9ae134d0..38f115085 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,4 @@
 include README.rst COPYING requirements.txt
 recursive-include modoboa *.html *.js *.css *.png *.po *.mo *.json *.gif
-recursive-include modoboa/core/templates *.py
+recursive-include modoboa/core/templates *.tpl
 recursive-include doc *
\ No newline at end of file
diff --git a/modoboa/core/commands/deploy.py b/modoboa/core/commands/deploy.py
index 25171b6f3..3c9c15107 100644
--- a/modoboa/core/commands/deploy.py
+++ b/modoboa/core/commands/deploy.py
@@ -114,17 +114,19 @@ class DeployCommand(Command):
         )
 
         mod = __import__(parsed_args.name, globals(), locals(), ['settings'])
-        tpl = self._render_template("%s/settings.py" % self._templates_dir, {
-            'default_conn': default_conn, 'amavis_conn': amavis_conn,
-            'secret_key': mod.settings.SECRET_KEY,
-            'name': parsed_args.name, 'django14': django14,
-            'allowed_host': allowed_host
-        })
+        tpl = self._render_template(
+            "%s/settings.py.tpl" % self._templates_dir, {
+                'default_conn': default_conn, 'amavis_conn': amavis_conn,
+                'secret_key': mod.settings.SECRET_KEY,
+                'name': parsed_args.name, 'django14': django14,
+                'allowed_host': allowed_host
+            }
+        )
         fp = open("%s/settings.py" % path, "w")
         fp.write(tpl)
         fp.close()
         shutil.copyfile(
-            "%s/urls.py" % self._templates_dir, "%s/urls.py" % path
+            "%s/urls.py.tpl" % self._templates_dir, "%s/urls.py" % path
         )
         os.mkdir("%s/media" % path)
 
diff --git a/modoboa/core/templates/settings.py b/modoboa/core/templates/settings.py.tpl
similarity index 100%
rename from modoboa/core/templates/settings.py
rename to modoboa/core/templates/settings.py.tpl
diff --git a/modoboa/core/templates/urls.py b/modoboa/core/templates/urls.py.tpl
similarity index 100%
rename from modoboa/core/templates/urls.py
rename to modoboa/core/templates/urls.py.tpl