diff --git a/resources/setup-general.sh.template b/savanna/resources/setup-general.sh.template
similarity index 100%
rename from resources/setup-general.sh.template
rename to savanna/resources/setup-general.sh.template
diff --git a/resources/setup-master.sh.template b/savanna/resources/setup-master.sh.template
similarity index 86%
rename from resources/setup-master.sh.template
rename to savanna/resources/setup-master.sh.template
index 86e9af0b84..24c065c5a7 100644
--- a/resources/setup-master.sh.template
+++ b/savanna/resources/setup-master.sh.template
@@ -1,4 +1,4 @@
-{% extends "resources/setup-general.sh.template" %}
+{% extends "setup-general.sh.template" %}
 
 {% block master %}
 echo "----- Populating slaves file"
diff --git a/savanna/service/cluster_ops.py b/savanna/service/cluster_ops.py
index 08dc2308de..c3a6d87abf 100644
--- a/savanna/service/cluster_ops.py
+++ b/savanna/service/cluster_ops.py
@@ -231,8 +231,8 @@ def _check_if_up(nova, node):
 
 
 def _render_template(template_name, **kwargs):
-    env = Environment(loader=PackageLoader('savanna', '..'))
-    templ = env.get_template('resources/%s.template' % template_name)
+    env = Environment(loader=PackageLoader('savanna', 'resources'))
+    templ = env.get_template('%s.template' % template_name)
     return templ.render(**kwargs)
 
 
diff --git a/setup.py b/setup.py
index fe0bb4d4f5..76d5d96122 100644
--- a/setup.py
+++ b/setup.py
@@ -25,6 +25,7 @@ setuptools.setup(
     ],
     cmdclass=common_setup.get_cmdclass(),
     packages=setuptools.find_packages(exclude=['bin']),
+    package_data={'savanna': ['resources/*.template']},
     install_requires=requires,
     dependency_links=depend_links,
     include_package_data=True,
@@ -34,5 +35,12 @@ setuptools.setup(
         'bin/savanna-api',
         'bin/savanna-manage',
     ],
-    py_modules=[]
+    py_modules=[],
+    data_files=[
+        ('share/savanna',
+         [
+             'etc/savanna/savanna.conf.sample',
+             'etc/savanna/savanna.conf.sample-full',
+         ]),
+    ],
 )