diff --git a/README.md b/README.md
index 58435eec8d..157e18ce7a 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,13 @@
 [![Build Status](https://travis-ci.org/eth-cscs/reframe.svg?branch=master)](https://travis-ci.org/eth-cscs/reframe)
 [![Documentation Status](https://readthedocs.org/projects/reframe-hpc/badge/?version=latest)](https://reframe-hpc.readthedocs.io/en/latest/?badge=latest)
-[![codecov.io](https://codecov.io/gh/eth-cscs/reframe/branch/master/graph/badge.svg)](https://codecov.io/github/eth-cscs/reframe)
+[![codecov.io](https://codecov.io/gh/eth-cscs/reframe/branch/master/graph/badge.svg)](https://codecov.io/github/eth-cscs/reframe)<br/>
+![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/eth-cscs/reframe?include_prereleases)
+![GitHub commits since latest release](https://img.shields.io/github/commits-since/eth-cscs/reframe/latest)
+![GitHub contributors](https://img.shields.io/github/contributors-anon/eth-cscs/reframe)<br/>
 [![PyPI version](https://badge.fury.io/py/ReFrame-HPC.svg)](https://badge.fury.io/py/ReFrame-HPC)
+![PyPI - Python Version](https://img.shields.io/pypi/pyversions/reframe-hpc)<br/>
+[![Slack](https://reframe-slack.herokuapp.com/badge.svg)](https://reframe-slack.herokuapp.com/)<br/>
 [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)
-[![Slack](https://reframe-slack.herokuapp.com/badge.svg)](https://reframe-slack.herokuapp.com/)
 
 # ReFrame
 
diff --git a/setup.py b/setup.py
index bc9f179d2c..d29be39a50 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 from reframe import VERSION
 
 with open('README.md') as read_me:
-    long_description = ''.join(read_me.readlines()[6:])
+    long_description = ''.join(read_me.readlines()[11:])
 
 setuptools.setup(
     name='ReFrame-HPC',