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},