diff --git a/openerp/cli/scaffold.py b/openerp/cli/scaffold.py
index dbe342d0d67..5999aad02a1 100644
--- a/openerp/cli/scaffold.py
+++ b/openerp/cli/scaffold.py
@@ -79,7 +79,7 @@ class ScaffoldModule(object):
     """
     def __init__(self, path):
         env = jinja2.Environment(loader=jinja2.PackageLoader(
-            'openerp.cli', 'scaffold'))
+            'openerp.cli', 'scaffold'), keep_trailing_newline=True)
         env.filters['snake'] = snake
         self.env = env
         self.path = functools.partial(os.path.join, directory(path))
diff --git a/openerp/cli/scaffold/__openerp__.jinja2 b/openerp/cli/scaffold/__openerp__.jinja2
index 838386a1ecb..b62a15d024a 100644
--- a/openerp/cli/scaffold/__openerp__.jinja2
+++ b/openerp/cli/scaffold/__openerp__.jinja2
@@ -19,7 +19,7 @@
     'version': '0.1',
 
     # any module necessary for this one to work correctly
-    'depends': ['base','website'],
+    'depends': ['base', 'website'],
     'data': [
     ],
 
diff --git a/openerp/cli/scaffold/models.jinja2 b/openerp/cli/scaffold/models.jinja2
index 36155a2566d..2409a121d49 100644
--- a/openerp/cli/scaffold/models.jinja2
+++ b/openerp/cli/scaffold/models.jinja2
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from openerp.osv import orm, fields
 
+
 class {{ model }}(orm.Model):
     _name = "{{ module }}.{{ model }}"