diff --git a/client/setup.py b/client/setup.py
index 0952048eab019edaef3dc28dde4ed97e78e1dd40..60c515bcde6854e9cc70119bb2e4b1226ef15b83 100644
--- a/client/setup.py
+++ b/client/setup.py
@@ -24,7 +24,7 @@ from setuptools import find_packages
 from setuptools import Command
 import versioneer
 
-trove_classifiers = (
+trove_classifiers = [
     "Development Status :: 3 - Alpha",
     "Intended Audience :: Developers",
     "License :: OSI Approved :: "
@@ -35,7 +35,7 @@ trove_classifiers = (
     "Programming Language :: Python :: 2.7",
     "Topic :: Database :: Front-Ends",
     "Topic :: Software Development :: Libraries :: Python Modules"
-)
+]
 
 DOWNLOAD_BASE = ('https://github.com/leapcode/bitmask_client/'
                  'archive/%s.tar.gz')
@@ -132,6 +132,9 @@ setup(
     maintainer='Kali Kaneko',
     maintainer_email='kali@leap.se',
     long_description=(
+        "**DEPRECATED - this package has been merged with other parts of "
+        "Soledad as is now available in**: "
+        "https://pypi.python.org/pypi/leap.soledad - "
         "Soledad is the part of LEAP that allows application data to be "
         "securely shared among devices. It provides, to other parts of the "
         "LEAP project, an API for data storage and sync."
diff --git a/common/setup.py b/common/setup.py
index 6de26034d03fc8a340086f10b8c0e2157cebf6bc..f9b953dda5e812b1b630373cf1f75f0a3f72e43b 100644
--- a/common/setup.py
+++ b/common/setup.py
@@ -28,7 +28,7 @@ import versioneer
 from pkg import utils
 
 
-trove_classifiers = (
+trove_classifiers = [
     "Development Status :: 3 - Alpha",
     "Intended Audience :: Developers",
     "License :: OSI Approved :: "
@@ -40,7 +40,7 @@ trove_classifiers = (
     "Programming Language :: Python :: 2.7",
     "Topic :: Database :: Front-Ends",
     "Topic :: Software Development :: Libraries :: Python Modules"
-)
+]
 
 DOWNLOAD_BASE = ('https://github.com/leapcode/bitmask_client/'
                  'archive/%s.tar.gz')
@@ -153,6 +153,9 @@ setup(
     maintainer='Kali Kaneko',
     maintainer_email='kali@leap.se',
     long_description=(
+        "**DEPRECATED - this package has been merged with other parts of "
+        "Soledad as is now available in**: "
+        "https://pypi.python.org/pypi/leap.soledad - "
         "Soledad is the part of LEAP that allows application data to be "
         "securely shared among devices. It provides, to other parts of the "
         "LEAP project, an API for data storage and sync."
diff --git a/server/setup.py b/server/setup.py
index a18d0b2d84ebb82c26791a568c30ce5592273662..a4bac85f91a8d2c670cacec254c7ad8f6bcb5a5b 100644
--- a/server/setup.py
+++ b/server/setup.py
@@ -35,7 +35,7 @@ else:
     data_files = [("/etc/init.d/", ["pkg/soledad-server"])]
 
 
-trove_classifiers = (
+trove_classifiers = [
     "Development Status :: 3 - Alpha",
     "Intended Audience :: Developers",
     "License :: OSI Approved :: "
@@ -47,7 +47,7 @@ trove_classifiers = (
     "Programming Language :: Python :: 2.7",
     "Topic :: Database :: Front-Ends",
     "Topic :: Software Development :: Libraries :: Python Modules"
-)
+]
 
 DOWNLOAD_BASE = ('https://github.com/leapcode/bitmask_client/'
                  'archive/%s.tar.gz')
@@ -148,6 +148,9 @@ setup(
     maintainer='Kali Kaneko',
     maintainer_email='kali@leap.se',
     long_description=(
+        "**DEPRECATED - this package has been merged with other parts of "
+        "Soledad as is now available in**: "
+        "https://pypi.python.org/pypi/leap.soledad - "
         "Soledad is the part of LEAP that allows application data to be "
         "securely shared among devices. It provides, to other parts of the "
         "LEAP project, an API for data storage and sync."