diff --git a/setup.py b/setup.py
index c1705ed9..d40371b7 100644
--- a/setup.py
+++ b/setup.py
@@ -18,14 +18,16 @@ setup(name='fdroidserver',
       author_email='team@f-droid.org',
       url='https://f-droid.org',
       packages=['fdroidserver', 'fdroidserver.asynchronousfilereader'],
-      scripts=['fdroid', 'fd-commit'],
+      scripts=['fdroid', 'fd-commit', 'makebuildserver'],
       data_files=[
           (data_prefix + '/share/doc/fdroidserver/examples',
               ['buildserver/config.buildserver.py',
-                  'examples/config.py',
-                  'examples/makebuildserver.config.py',
-                  'examples/opensc-fdroid.cfg',
-                  'examples/fdroid-icon.png']),
+               'examples/config.py',
+               'examples/fdroid-icon.png'
+               'examples/makebuildserver.config.py',
+               'examples/opensc-fdroid.cfg',
+               'examples/public-read-only-s3-bucket-policy.json',
+               'examples/template.yml']),
       ],
       install_requires=[
           'clint',