--- a/setup.py	Sun Feb 27 00:35:11 2011 +0100
+++ b/setup.py	Thu Mar 17 01:13:48 2011 +0100
@@ -1,19 +1,19 @@
 import sys
+from rhodecode import get_version
+from rhodecode import __platform__
+
 py_version = sys.version_info
 
-from rhodecode import get_version
-
 requirements = [
         "Pylons==1.0.0",
         "WebHelpers==1.2",
         "SQLAlchemy==0.6.6",
-        "Mako==0.3.6",
-        "vcs==0.1.10",
-        "pygments==1.3.1",
+        "Mako==0.4.0",
+        "vcs==0.1.11",
+        "pygments==1.4.0",
         "mercurial==1.7.5",
         "whoosh==1.3.4",
-        "celery==2.1.4",
-        "py-bcrypt",
+        "celery==2.2.4",
         "babel",
     ]
 
@@ -25,10 +25,14 @@
                'Operating System :: OS Independent',
                'Programming Language :: Python', ]
 
-if sys.version_info < (2, 6):
+if py_version < (2, 6):
     requirements.append("simplejson")
     requirements.append("pysqlite")
 
+if __platform__ in ('Linux', 'Darwin'):
+    requirements.append("py-bcrypt")
+
+
 #additional files from project that goes somewhere in the filesystem
 #relative to sys.prefix
 data_files = []
@@ -38,6 +42,10 @@
 
 description = ('Mercurial repository browser/management with '
                'build in push/pull server and full text search')
+keywords = ' '.join (['rhodecode', 'rhodiumcode', 'mercurial', 'git',
+                      'repository management', 'hgweb replacement'
+                      'hgwebdir', 'gitweb replacement', 'serving hgweb',
+                     ])
 #long description
 try:
     readme_file = 'README.rst'
@@ -66,7 +74,7 @@
     version=get_version(),
     description=description,
     long_description=long_description,
-    keywords='rhodiumcode mercurial web hgwebdir gitweb git replacement serving hgweb rhodecode',
+    keywords=keywords,
     license='BSD',
     author='Marcin Kuzminski',
     author_email='marcin@python-works.com',