3 files changed, 11 insertions, 10 deletions
diff --git a/repoze/bfg/paster_template/+package+.ini_tmpl b/repoze/bfg/paster_template/+package+.ini_tmpl
index 9bb03718c..2d6c4d0a2 100644
--- a/repoze/bfg/paster_template/+package+.ini_tmpl
+++ b/repoze/bfg/paster_template/+package+.ini_tmpl
@@ -2,10 +2,11 @@
 debug = true
 
 [app:main]
-use = egg:{{project}}#make_app
+use = egg:{{project}}#app
+reload_templates = true
 
 [server:main]
 use = egg:PasteScript#cherrypy
 host = 0.0.0.0
-port = 5432
+port = 6543
 numthreads = 4
diff --git a/repoze/bfg/paster_template/+package+/run.py_tmpl b/repoze/bfg/paster_template/+package+/run.py_tmpl
index f8228d30a..b3c3d1ed7 100644
--- a/repoze/bfg/paster_template/+package+/run.py_tmpl
+++ b/repoze/bfg/paster_template/+package+/run.py_tmpl
@@ -1,13 +1,13 @@
-def make_app(global_config, **kw):
+from repoze.bfg import make_app
+from repoze.bfg import get_options
+
+def app(global_config, **kw):
     # paster app config callback
-    from repoze.bfg import make_app
     from {{project}}.models import get_root
     import {{ project}}
-    app = make_app(get_root, {{project}})
-    return app
+    return make_app(get_root, {{project}}, options=get_options(kw))
 
 if __name__ == '__main__':
     from paste import httpserver
-    app = make_app(None)
-    httpserver.serve(app, host='0.0.0.0', port='5432')
+    httpserver.serve(app(None), host='0.0.0.0', port='6543')
     
diff --git a/repoze/bfg/paster_template/setup.py_tmpl b/repoze/bfg/paster_template/setup.py_tmpl
index 278153de8..d2b4d575b 100644
--- a/repoze/bfg/paster_template/setup.py_tmpl
+++ b/repoze/bfg/paster_template/setup.py_tmpl
@@ -35,10 +35,10 @@ setup(name='{{project}}',
       tests_require=[
             'repoze.bfg',
             ],
-      test_suite="{{project}}.tests",
+      test_suite="{{project}}",
       entry_points = """\
       [paste.app_factory]
-      make_app = {{project}}.run:make_app
+      app = {{project}}.run:app
       """
       )