diff --git a/MANIFEST.in b/MANIFEST.in
index e2d4fd6aaa6..e2227fa0842 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -9,3 +9,4 @@ include tests/integration/files/*
 include tests/integration/tmp/_README
 include tests/unit/templates/files/*
 recursive-include doc *
+include conf/*
diff --git a/setup.py b/setup.py
index 3370e8bad71..c1104b6d9a5 100755
--- a/setup.py
+++ b/setup.py
@@ -97,11 +97,7 @@ setup(
                'scripts/salt-call',
                'scripts/salt-run',
                'scripts/salt'],
-      data_files=[(os.path.join(etc_path, 'salt'),
-                    ['conf/master.template',
-                     'conf/minion.template',
-                    ]),
-                ('share/man/man1',
+      data_files=[('share/man/man1',
                     ['doc/man/salt-master.1',
                      'doc/man/salt-key.1',
                      'doc/man/salt.1',