diff --git a/bin/mopidy b/bin/mopidy
deleted file mode 100755
index 0472518e..00000000
--- a/bin/mopidy
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /usr/bin/env python
-
-if __name__ == '__main__':
-    from mopidy.__main__ import main
-    main()
diff --git a/bin/mopidy-scan b/bin/mopidy-scan
deleted file mode 100755
index 00f51809..00000000
--- a/bin/mopidy-scan
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /usr/bin/env python
-
-if __name__ == '__main__':
-    from mopidy.scanner import main
-    main()
diff --git a/setup.py b/setup.py
index 1c0d10b8..eeab24bd 100644
--- a/setup.py
+++ b/setup.py
@@ -40,6 +40,10 @@ setup(
         'unittest2',
     ],
     entry_points={
+        b'console_scripts': [
+            'mopidy = mopidy.__main__:main',
+            'mopidy-scan = mopidy.scanner:main',
+        ],
         b'mopidy.extension': [],
     },
     classifiers=[