diff --git a/CHANGES.txt b/CHANGES.txt
index d97f5d5..46fef22 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,8 @@ Changes
 3.4.4 (unreleased)
 ------------------
 
+* Depend on zope.session instead of zope.app.session. The first one
+  currently has all functionality we need.
 * Fix deprecation warnings for ``md5`` and ``sha`` on Python 2.6.
 
 3.4.3 (2008-08-07)
diff --git a/setup.py b/setup.py
index e56a1a6..a297255 100644
--- a/setup.py
+++ b/setup.py
@@ -66,7 +66,6 @@ def read(*rnames):
                         'zope.app.container',
                         'zope.app.form',
                         'zope.app.security',
-                        'zope.app.session',
                         'zope.dublincore',
                         'zope.event',
                         'zope.exceptions',
@@ -77,6 +76,7 @@ def read(*rnames):
                         'zope.publisher',
                         'zope.schema',
                         'zope.security',
+                        'zope.session',
                         'zope.traversing',
                         'ZODB3',
                         ],
diff --git a/src/zope/app/authentication/ftesting.zcml b/src/zope/app/authentication/ftesting.zcml
index 88899e9..15b407c 100644
--- a/src/zope/app/authentication/ftesting.zcml
+++ b/src/zope/app/authentication/ftesting.zcml
@@ -11,8 +11,8 @@
 
   <include package="zope.app.zcmlfiles" />
   <include package="zope.formlib" />
+  <include package="zope.session" />
   <include package="zope.app.authentication" />
-  <include package="zope.app.session" />
   <include package="zope.app.securitypolicy" />
 
   <securityPolicy