diff --git a/README.md b/README.md
index 529c7ea..0c74e10 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
 HDD Fan control
 ===============
 
-[![Latest Version](https://pypip.in/version/hddfancontrol/badge.svg?style=flat)](https://pypi.python.org/pypi/hddfancontrol/)
+[![Latest Version](https://img.shields.io/pypi/v/hddfancontrol.svg?style=flat)](https://pypi.python.org/pypi/hddfancontrol/)
 [![Tests Status](https://img.shields.io/travis/desbma/hddfancontrol/master.svg?label=tests&style=flat)](https://travis-ci.org/desbma/hddfancontrol)
 [![Coverage](https://img.shields.io/coveralls/desbma/hddfancontrol/master.svg?style=flat)](https://coveralls.io/r/desbma/hddfancontrol?branch=master)
 [![Supported Python versions](https://pypip.in/py_versions/hddfancontrol/badge.svg?style=flat)](https://pypi.python.org/pypi/hddfancontrol/)
-[![License](https://pypip.in/license/hddfancontrol/badge.svg?style=flat)](https://pypi.python.org/pypi/hddfancontrol/)
+[![License](https://img.shields.io/github/license/desbma/hddfancontrol.svg?style=flat)](https://pypi.python.org/pypi/hddfancontrol/)
 
 HDD Fan control is a command line tool to dynamically control fan speed according to hard drive temperature on Linux.