diff --git a/setup.py b/setup.py
index 95291ea9c..a0ea8ca1c 100644
--- a/setup.py
+++ b/setup.py
@@ -308,7 +308,7 @@ install_requires = [
 metadata = dict(
     name='numba',
     description="compiling Python code using LLVM",
-    version=versioneer.get_version(),
+    version=versioneer.get_version().split('+')[0],
     classifiers=[
         "Development Status :: 4 - Beta",
         "Intended Audience :: Developers",
@@ -335,7 +335,12 @@ metadata = dict(
         # numba gdb hook init command language file
         "numba.misc": ["cmdlang.gdb"],
     },
-    scripts=["numba/pycc/pycc", "bin/numba"],
+    entry_points={
+        'console_scripts': [
+            'pycc=numba.pycc:main',
+            'numba=numba.misc.numba_entry:main'
+            ]
+    },
     author="Anaconda, Inc.",
     author_email="numba-users@continuum.io",
     url="https://numba.github.com",
@@ -349,6 +354,7 @@ metadata = dict(
 
 with open('README.rst') as f:
     metadata['long_description'] = f.read()
+metadata['long_description_content_type'] = 'text/x-rst'
 
 if is_building():
     metadata['ext_modules'] = get_ext_modules()
