diff --git a/setup.py b/setup.py
index 71754ed28..ad31000a0 100644
--- a/setup.py
+++ b/setup.py
@@ -20,11 +20,9 @@
 
 import os
 try:
-    from setuptools import setup, find_packages
-    from setuptools.extension import Extension
+    from setuptools import setup
 except ImportError:
-    from distutils.core import setup, find_packages
-    from distutils.extension import Extension
+    from distutils.core import setup
 
 
 # Used for reading the README into long_description below.
@@ -32,12 +30,10 @@ def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
 
 
-packages = find_packages(exclude=("test", "test.*"))
-
-setup(name=__package__,
-      version="1.0.0",
-      description="Python driver for Neo4j",
-      license="Apache",
+setup(name="neo4j-driver",
+      version="1.0.0-M01",
+      description="Neo4j Bolt driver for Python",
+      license="Apache License, Version 2.0",
       long_description=read("README.rst"),
       author="Neo Technology",
       keywords="neo4j graph database",
@@ -48,11 +44,6 @@ def read(fname):
           "Operating System :: OS Independent",
           "Topic :: Database",
           "Topic :: Software Development",
-          "Programming Language :: Python :: 2.6",
           "Programming Language :: Python :: 2.7",
-          "Programming Language :: Python :: 3.3",
-          "Programming Language :: Python :: 3.4",
-          "Programming Language :: Python :: 3.5",
-          "Programming Language :: Python :: Implementation :: Jython",
       ],
-      packages=packages)
+      packages=["neo4j"])