diff --git a/pubs/pubs b/pubs/pubs
deleted file mode 100755
index 68fd3d7..0000000
--- a/pubs/pubs
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env python
-# -*- coding:utf-8 -*-
-# PYTHON_ARGCOMPLETE_OK
-
-from pubs import pubs_cmd
-
-
-pubs_cmd.execute()
diff --git a/pubs/pubs_cmd.py b/pubs/pubs_cmd.py
index 2edfd65..2018ef8 100644
--- a/pubs/pubs_cmd.py
+++ b/pubs/pubs_cmd.py
@@ -1,3 +1,5 @@
+# PYTHON_ARGCOMPLETE_OK
+
 import sys
 import argparse
 import collections
diff --git a/setup.py b/setup.py
index ac3196f..cc38048 100644
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,11 @@ setup(
               'pubs.templates',
               'pubs.plugs',
               'pubs.plugs.alias'],
-    scripts=['pubs/pubs'],
+    entry_points={
+        'console_scripts': [
+            'pubs=pubs.pubs_cmd:execute',
+            ],
+        },
 
     install_requires=['pyyaml', 'bibtexparser', 'python-dateutil', 'requests',
                       'configobj',