diff --git a/bin/vstarstack b/bin/vstarstack
deleted file mode 100755
index ed595c33..00000000
--- a/bin/vstarstack
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env python3
-
-import sys
-
-import vstarstack.tool.process
-import vstarstack.tool.cfg
-import vstarstack.tool.usage
-
-program_project = vstarstack.tool.cfg.get_project()
-
-if vstarstack.tool.cfg.get_param("autocomplete", bool, False):
-    #with open("complete", "w") as f:
-    #    print(sys.argv, file=f)
-    program_argv = [item for item in sys.argv[2:] if item[:2] != "--"]
-    variants = vstarstack.tool.usage.autocompletion(vstarstack.tool.process.commands,
-                                                    program_argv)
-    for variant in variants:
-        print(variant)
-else:
-    program_argv = [item for item in sys.argv[1:] if item[:2] != "--"]
-    vstarstack.tool.usage.run(program_project,
-                              program_argv,
-                              "",
-                              vstarstack.tool.process.commands)
diff --git a/setup.py b/setup.py
index 93d02ed4..862536f3 100644
--- a/setup.py
+++ b/setup.py
@@ -70,13 +70,17 @@
        version = '0.1',
        author='Vladislav Tsendrovskii',
        description = 'Stacking astrophotos',
-       scripts = ['bin/vstarstack'],
        package_dir = {'': 'src'},
        packages=packages,
        ext_modules = [projection,
                       movements,
                       image_deform,
                     ],
+       entry_points = {
+           'console_scripts': [
+               'vstarstack = vstarstack.entry:main',
+           ],
+       },
        install_requires = [
               'numpy',
               'astropy',
diff --git a/src/vstarstack/entry.py b/src/vstarstack/entry.py
new file mode 100755
index 00000000..c2ef17cb
--- /dev/null
+++ b/src/vstarstack/entry.py
@@ -0,0 +1,25 @@
+#!/usr/bin/env python3
+
+import sys
+
+import vstarstack.tool.process
+import vstarstack.tool.cfg
+import vstarstack.tool.usage
+
+def main():
+    program_project = vstarstack.tool.cfg.get_project()
+
+    if vstarstack.tool.cfg.get_param("autocomplete", bool, False):
+        #with open("complete", "w") as f:
+        #    print(sys.argv, file=f)
+        program_argv = [item for item in sys.argv[2:] if item[:2] != "--"]
+        variants = vstarstack.tool.usage.autocompletion(vstarstack.tool.process.commands,
+                                                    program_argv)
+        for variant in variants:
+            print(variant)
+    else:
+        program_argv = [item for item in sys.argv[1:] if item[:2] != "--"]
+        vstarstack.tool.usage.run(program_project,
+                                  program_argv,
+                                  "",
+                                  vstarstack.tool.process.commands)