diff --git a/buildout.cfg b/buildout.cfg
index 481ab7f5b15a43c13c42013779780c1d23275180..f000e20be57568bef572259ea61f7828a523fd72 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -6,18 +6,9 @@
 
 [buildout]
 parts = scripts
-newest = false
 develop = .
-
-; required packages: sphinx (to generate the documentation), bob, and our package.
 eggs = bob.example.faceverify
-
-; This points to the bob databases that are installed locally at Idiap
-; TODO: remove this as soon as the databases are published at pypi
-find-links = http://www.idiap.ch/software/bob/packages/xbob/nightlies/last
-
-[bob.example.faceverify]
-recipe = xbob.buildout:develop
+newest = false
 
 [scripts]
 recipe = xbob.buildout:scripts
diff --git a/setup.py b/setup.py
index 06a740b4a15570766221dc86a2c884f92dc13d3a..a9f0d98f2b453b6f7e3b405d9dcf6da0a390027c 100644
--- a/setup.py
+++ b/setup.py
@@ -39,6 +39,8 @@ setup(
 
     # This line is required for any distutils based packaging.
     packages=find_packages(),
+    include_package_data=True,
+    zip_safe=True,
 
     # This line defines which packages should be installed when you "install"
     # this package. All packages that are mentioned here, but are not installed
@@ -46,9 +48,8 @@ setup(
     # scripts of this package. Don't worry - You won't need administrative
     # privileges when using buildout.
 
-    # TODO: Add a version number requirement to bob, when ready
     install_requires=[
-        "sphinx",                     # to generate the documentation
+        "setuptools",                 
         "bob >= 1.1.0",               # base signal proc./machine learning library
         "xbob.db.atnt",               # the AT&T (ORL) database of images
     ],