--- a/testing/marionette/client/marionette_driver/__init__.py
+++ b/testing/marionette/client/marionette_driver/__init__.py
@@ -1,13 +1,13 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-__version__ = '2.1.0'
+__version__ = '2.2.0'
 
 from marionette_driver import (
     addons,
     by,
     date_time_value,
     decorators,
     errors,
     expected,

--- a/testing/marionette/client/setup.py
+++ b/testing/marionette/client/setup.py
@@ -18,17 +18,30 @@ def get_version():
     return re.findall("__version__ = '([\d\.]+)'",
                       read('marionette_driver', '__init__.py'), re.M)[0]
 
 
 setup(name='marionette_driver',
       version=get_version(),
       description="Marionette Driver",
       long_description='See http://marionette-client.readthedocs.org/en/latest/',
-      classifiers=[],  # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
+      # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
+      classifiers=[
+          'Development Status :: 5 - Production/Stable',
+          'Intended Audience :: Developers',
+          'License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)',
+          'Operating System :: MacOS :: MacOS X',
+          'Operating System :: Microsoft :: Windows',
+          'Operating System :: POSIX',
+          'Topic :: Software Development :: Quality Assurance',
+          'Topic :: Software Development :: Testing',
+          'Topic :: Utilities',
+          'Programming Language :: Python',
+          'Programming Language :: Python :: 2.7',
+      ],
       keywords='mozilla',
       author='Auto-tools',
       author_email='tools-marionette@lists.mozilla.org',
       url='https://wiki.mozilla.org/Auto-tools/Projects/Marionette',
       license='MPL',
       packages=find_packages(),
       include_package_data=True,
       zip_safe=False,

new file mode 100644
--- /dev/null
+++ b/testing/marionette/harness/README.rst
@@ -0,0 +1,8 @@
+marionette-client
+=================
+
+marionette_client has been renamed and is now available as marionette-harness:
+
+* marionette-harness <https://pypi.python.org/pypi/marionette-harness/>`_
+
+Please consider migrating to this new package.

--- a/testing/marionette/harness/marionette/__init__.py
+++ b/testing/marionette/harness/marionette/__init__.py
@@ -1,13 +1,13 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-__version__ = '3.2.0'
+__version__ = '3.3.0'
 
 from .marionette_test import (
     CommonTestCase,
     expectedFailure,
     MarionetteTestCase,
     run_if_e10s,
     skip,
     skip_if_chrome,

--- a/testing/marionette/harness/requirements.txt
+++ b/testing/marionette/harness/requirements.txt
@@ -1,11 +1,11 @@
 browsermob-proxy >= 0.6.0
 manifestparser >= 1.1
-marionette-driver >= 2.1.0
+marionette-driver >= 2.2.0
 mozcrash >= 0.5
 mozdevice >= 0.44
 mozinfo >= 0.8
 mozlog >= 3.0
 moznetwork >= 0.21
 mozprocess >= 0.9
 mozprofile >= 0.7
 mozrunner >= 6.13

--- a/testing/marionette/harness/setup.py
+++ b/testing/marionette/harness/setup.py
@@ -1,10 +1,11 @@
 import os
 import re
+
 from setuptools import setup, find_packages
 
 
 THIS_DIR = os.path.dirname(os.path.realpath(__name__))
 
 
 def read(*parts):
     with open(os.path.join(THIS_DIR, *parts)) as f:
@@ -14,24 +15,37 @@ def read(*parts):
 def get_version():
     return re.findall("__version__ = '([\d\.]+)'",
                       read('marionette', '__init__.py'), re.M)[0]
 
 
 setup(name='marionette_client',
       version=get_version(),
       description="Marionette test automation client",
-      long_description='See http://marionette-client.readthedocs.org/',
-      classifiers=[],  # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
+      long_description=open('README.rst').read(),
+      # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
+      classifiers=[
+          'Development Status :: 7 - Inactive',
+          'Intended Audience :: Developers',
+          'License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)',
+          'Operating System :: MacOS :: MacOS X',
+          'Operating System :: Microsoft :: Windows',
+          'Operating System :: POSIX',
+          'Topic :: Software Development :: Quality Assurance',
+          'Topic :: Software Development :: Testing',
+          'Topic :: Utilities',
+          'Programming Language :: Python',
+          'Programming Language :: Python :: 2.7',
+      ],
       keywords='mozilla',
-      author='Jonathan Griffin',
-      author_email='jgriffin@mozilla.com',
+      author='Auto-tools',
+      author_email='tools-marionette@lists.mozilla.org',
       url='https://wiki.mozilla.org/Auto-tools/Projects/Marionette',
-      license='MPL',
-      packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
+      license='Mozilla Public License 2.0 (MPL 2.0)',
+      packages=['marionette_client'],
       package_data={'marionette': ['touch/*.js']},
       include_package_data=True,
       zip_safe=False,
       entry_points="""
       # -*- Entry points: -*-
       [console_scripts]
       marionette = marionette.runtests:cli
       """,