--- a/INSTALL	Mon Aug 09 05:42:56 2010 +0000
+++ b/INSTALL	Mon Aug 09 06:19:48 2010 +0000
@@ -4,11 +4,11 @@
 
 The Virtual Mail Manager depends on:
     - Python (>= 2.4.0)
-    - pyPgSQL¹
+    - Psycopg 2¹ or pyPgSQL²
 
 If you are using Python <= 2.5.0:
     - if you want to store your users' passwords as PLAIN-MD4 digest in
-      the database, vmm will try to use Crypto.Hash.MD4 from PyCrypto².
+      the database, vmm will try to use Crypto.Hash.MD4 from PyCrypto³.
     - if you are using Dovecot >= v1.1.0 and you want to store your users'
       passwords as SHA256 or SSHA256 hashes, vmm will try to use
       Crypto.Hash.SHA256 from PyCrypto². For SHA256/SSHA256 you should have
@@ -18,8 +18,9 @@
     dovecotpw/doveadm, if the misc.password_scheme setting in the vmm.cfg
     is set to PLAIN-MD4, SHA256 or SSHA256
 
-[1] pyPgSQL: <http://pypgsql.sourceforge.net/> (Debian: python-pgsql)
-[2] PyCrypto: <http://www.pycrypto.org/> (Debian: python-crypto)
+[1] Psycopg: <http://initd.org/psycopg/> (Debian: python-psycopg2)
+[2] pyPgSQL: <http://pypgsql.sourceforge.net/> (Debian: python-pgsql)
+[3] PyCrypto: <http://www.pycrypto.org/> (Debian: python-crypto)
 
 
 Configuring PostgreSQL
@@ -177,9 +178,9 @@
 
 Installing the Virtual Mail Manager and configure the rest
 
-    Installing from SVN or vmm-x.y.z.tar.bz2
-    after checking out from svn or extracting the archive change into the new
-    directory and type:
+    Installing from Mercurial or vmm-x.y.z.tar.bz2
+    after cloning from the hg repo or extracting the archive change into the
+    new directory and type:
         ./install.sh
     edit all the pgsql-*.cf files in /etc/postfix
 

--- a/setup.py	Mon Aug 09 05:42:56 2010 +0000
+++ b/setup.py	Mon Aug 09 06:19:48 2010 +0000
@@ -18,10 +18,11 @@
 """
 packages = [
     'VirtualMailManager',
-    'VirtualMailManager.constants',
+    'VirtualMailManager.cli',
     'VirtualMailManager.ext',
     'VirtualMailManager.pycompat',
 ]
+# http://pypi.python.org/pypi?%3Aaction=list_classifiers
 classifiers = ['Development Status :: 5 - Production/Stable',
                'Environment :: Console',
                'Intended Audience :: System Administrators',
@@ -35,6 +36,7 @@
                'Operating System :: POSIX :: Linux',
                'Operating System :: POSIX :: Other',
                'Programming Language :: Python',
+               'Programming Language :: Python :: 2',
                'Topic :: Communications :: Email',
                'Topic :: System :: Systems Administration',
                'Topic :: Utilities']
@@ -60,6 +62,6 @@
               'classifiers': classifiers}
 
 if 'requires' in DistributionMetadata._METHOD_BASENAMES:
-    setup_args['requires'] = ['pyPgSQL']
+    setup_args['requires'] = ['psycopg2>=2.0', 'pyPgSQL>=2.5.1']
 
 setup(**setup_args)