diff --git a/MANIFEST.in b/MANIFEST.in
index ecb611c2..cd31647d 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -18,7 +18,6 @@ include examples/makebuildserver.config.py
 include examples/opensc-fdroid.cfg
 include examples/public-read-only-s3-bucket-policy.json
 include examples/template.yml
-include fdroid
 include gradlew-fdroid
 include LICENSE
 include locale/bo/LC_MESSAGES/fdroidserver.mo
diff --git a/setup.py b/setup.py
index ae7ec2db..afb3afc7 100755
--- a/setup.py
+++ b/setup.py
@@ -62,7 +62,10 @@ setup(name='fdroidserver',
       url='https://f-droid.org',
       license='AGPL-3.0',
       packages=['fdroidserver', 'fdroidserver.asynchronousfilereader'],
-      scripts=['fdroid', 'makebuildserver'],
+      scripts=['makebuildserver'],
+      entry_points={
+          'console_scripts': ['fdroid=fdroidserver.__main__:main']
+      },
       data_files=get_data_files(),
       python_requires='>=3.5',
       cmdclass={'versioncheck': VersionCheckCommand},