diff --git a/setup.cfg b/setup.cfg
index 839472544571..14dcb5c8edde 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,4 +1,10 @@
 [build_sphinx]
+all_files = 1
+build-dir = doc/build
 source-dir = doc/source
-build-dir  = doc/build
-all_files  = 1
+
+[egg_info]
+tag_build = 
+tag_date = 0
+tag_svn_revision = 0
+
diff --git a/setup.py b/setup.py
index f9a616335993..127d014b1940 100644
--- a/setup.py
+++ b/setup.py
@@ -16,19 +16,24 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import glob
-import os
-import sys
-
 from setuptools import setup, find_packages
 
-srcdir = os.path.join(os.path.dirname(sys.argv[0]), 'src')
-
 setup(name='nova',
       version='0.9.0',
       description='cloud computing fabric controller',
       author='OpenStack',
       author_email='nova@lists.launchpad.net',
       url='http://www.openstack.org/',
-      packages = find_packages(),
+      packages = find_packages(exclude=['bin','smoketests']),
+      scripts=['bin/nova-api',
+               'bin/nova-compute',
+               'bin/nova-dhcpbridge',
+               'bin/nova-import-canonical-imagestore',
+               'bin/nova-instancemonitor',
+               'bin/nova-manage',
+               'bin/nova-network',
+               'bin/nova-objectstore',
+               'bin/nova-rsapi',
+               'bin/nova-volume',
+      ]
      )