diff --git a/.travis.yml b/.travis.yml
index 5eb9ebe..683e6be 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,9 +9,8 @@ env:
   - TOX_ENV=pypy
 
 script:
-  - python -m pip install setuptools pip sphinx -U
   - ./bin/test_standalone.sh
-  - pip install tox
+  - python -m pip install setuptools pip sphinx tox -U
   - tox -e $TOX_ENV
   - ./bin/check_readme.sh
 
diff --git a/README.rst b/README.rst
index 679bb3c..4e46abd 100644
--- a/README.rst
+++ b/README.rst
@@ -15,13 +15,15 @@ pypiserver - minimal PyPI server for use with pip/easy_install
 :Source:      https://github.com/pypiserver/pypiserver
 :PyPI:        https://pypi.python.org/pypi/pypiserver
 :Travis:      https://travis-ci.org/pypiserver/pypiserver
-:Maintainer:  Kostis Anagnostopoulos <ankostis@gmail.com>
+:Maintainers: Kostis Anagnostopoulos <ankostis@gmail.com>,
+              Matthew Planchard <mplanchard@gmail.com>
 :License:     zlib/libpng + MIT
 
 *pypiserver* is a minimal PyPI_ compatible server for *pip* or *easy_install*.
 It is based on bottle_ and serves packages from regular directories.
 Wheels, bdists, eggs and accompanying PGP-signatures can be uploaded
-either with *pip*, *setuptools*, *twine* or simply copied with *scp*.
+either with *pip*, *setuptools*, `twine`_, `pypi-uploader`_, or simply copied
+with *scp*.
 
 
 .. contents:: Table of Contents
diff --git a/setup.py b/setup.py
index 165932e..d2dafd3 100644
--- a/setup.py
+++ b/setup.py
@@ -43,7 +43,8 @@ setup(name="pypiserver",
       },
       tests_require=tests_require,
       url="https://github.com/pypiserver/pypiserver",
-      maintainer="Kostis Anagnostopoulos",
+      maintainer=("Kostis Anagnostopoulos <ankostis@gmail.com>"
+              "Matthew Planchard <mplanchard@gmail.com>"),
       maintainer_email="ankostis@gmail.com",
       classifiers=[
           "Development Status :: 5 - Production/Stable",