Index: van/testing/layer.py
===================================================================
--- van/testing/layer.py	(revision 98789)
+++ van/testing/layer.py	(working copy)
@@ -12,12 +12,15 @@
 #
 ##############################################################################
 from zope.configuration import xmlconfig
-from zope.app.component import hooks # BBB: import from zope.site at a later date
+try:
+    from zope.site import hooks
+except ImportError:
+    from zope.app.component import hooks
 from zope.testing.cleanup import cleanUp
 import wsgi_intercept
 
 def null_layer(layer):
-    """Sets up a class as a layer that doesn nothing.
+    """Sets up a class as a layer that does nothing.
 
     Useful if you want a layer to inherit from other layers but not inherit
     their methods. Inheriting the method can cause it to be triggered twice as
Index: setup.py
===================================================================
--- setup.py	(revision 98789)
+++ setup.py	(working copy)
@@ -23,9 +23,9 @@
     )
 
 setup(name="van.testing",
-      version='2.0.0dev',
+      version='2.0.1dev',
       license='ZPL 2.1',
-      url='http://pypi.python.org/pypi/van.timeformat',
+      url='http://pypi.python.org/pypi/van.testing',
       author_email='zope-dev@zope.org',
       author="Vanguardistas LLC",
       description="Layers for zope.testing to simplify test setups",
@@ -34,7 +34,7 @@
       install_requires=[
           'setuptools',
           'wsgi_intercept',
-          'zope.app.component',
+          'zope.site',
           'zope.component',
           'zope.configuration',
           'zope.testing',
