2 files changed, 9 insertions, 1 deletions

diff --git a/README.mkd b/README.mkd
index 538731a2..5f4aa650 100644
--- a/README.mkd
+++ b/README.mkd
@@ -1,4 +1,9 @@
-[![Build Status](https://travis-ci.org/mitmproxy/pathod.png?branch=master)](https://travis-ci.org/mitmproxy/pathod) [![Coverage Status](https://coveralls.io/repos/mitmproxy/pathod/badge.png?branch=master)](https://coveralls.io/r/mitmproxy/pathod)
+[![Build Status](https://img.shields.io/travis/mitmproxy/pathod/master.svg)](https://travis-ci.org/mitmproxy/pathod) 
+[![Coverage Status](https://img.shields.io/coveralls/mitmproxy/pathod/master.svg)](https://coveralls.io/r/mitmproxy/pathod)
+[![Downloads](https://img.shields.io/pypi/dm/pathod.svg?color=orange)](https://pypi.python.org/pypi/pathod)
+[![Latest Version](https://img.shields.io/pypi/v/pathod.svg)](https://pypi.python.org/pypi/pathod)
+[![Supported Python versions](https://img.shields.io/pypi/pyversions/pathod.svg)](https://pypi.python.org/pypi/pathod)
+[![Supported Python implementations](https://img.shields.io/pypi/implementation/pathod.svg)](https://pypi.python.org/pypi/pathod)
 
 __pathod__ is a collection of pathological tools for testing and torturing HTTP
 clients and servers. The project has three components:
diff --git a/setup.py b/setup.py
index 1a6a3e3f..041b164d 100644
--- a/setup.py
+++ b/setup.py
@@ -26,6 +26,9 @@ setup(
         "Operating System :: POSIX",
         "Programming Language :: Python",
         "Programming Language :: Python :: 2",
+        "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: Implementation :: CPython",
+        "Programming Language :: Python :: Implementation :: PyPy",
         "Topic :: Internet",
         "Topic :: Internet :: WWW/HTTP",
         "Topic :: Internet :: WWW/HTTP :: HTTP Servers",