diff --git a/setup.py b/setup.py
index cb6a3a81..25d6be85 100644
--- a/setup.py
+++ b/setup.py
@@ -7,13 +7,15 @@ setup(name='FDroidServer',
       description='F-Droid Server Tools',
       long_description=open('README').read(),
       author='The F-Droid Project',
-      author_email='admin@f-droid.org',
-      url='http://f-droid.org',
+      author_email='team@f-droid.org',
+      url='https://f-droid.org',
       packages=['fdroidserver'],
       scripts=['fdroid'],
       data_files=[
         ('share/doc/fdroidserver/examples',
-         ['config.buildserver.py', 'config.sample.py', 'makebs.config.sample.py',
+         [ 'config.buildserver.py',
+             'sampleconfigs/config.sample.py',
+             'sampleconfigs/makebs.config.sample.py',
           'fdroid-icon.png']),
         ],
       install_requires=[