diff --git a/README.rst b/README.rst
index 36c622898c1e1d50313aaa913ba0bcd1a14ce268..819872f669e6513b4934b520d9ad0190c096b2e6 100644
--- a/README.rst
+++ b/README.rst
@@ -1,17 +1,17 @@
 .. vim: set fileencoding=utf-8 :
 .. Mon 15 Aug 2016 09:48:28 CEST
 
-.. image:: http://img.shields.io/badge/docs-stable-yellow.png
+.. image:: http://img.shields.io/badge/docs-stable-yellow.svg
    :target: http://pythonhosted.org/bob.learn.em/index.html
-.. image:: http://img.shields.io/badge/docs-latest-orange.png
+.. image:: http://img.shields.io/badge/docs-latest-orange.svg
    :target: https://www.idiap.ch/software/bob/docs/latest/bob/bob.learn.em/master/index.html
 .. image:: https://gitlab.idiap.ch/bob/bob.learn.em/badges/master/build.svg
    :target: https://gitlab.idiap.ch/bob/bob.learn.em/commits/master
 .. image:: https://img.shields.io/badge/gitlab-project-0000c0.svg
    :target: https://gitlab.idiap.ch/bob/bob.learn.em
-.. image:: http://img.shields.io/pypi/v/bob.learn.em.png
+.. image:: http://img.shields.io/pypi/v/bob.learn.em.svg
    :target: https://pypi.python.org/pypi/bob.learn.em
-.. image:: http://img.shields.io/pypi/dm/bob.learn.em.png
+.. image:: http://img.shields.io/pypi/dm/bob.learn.em.svg
    :target: https://pypi.python.org/pypi/bob.learn.em
 
 
@@ -63,5 +63,5 @@ development `mailing list`_.
 
 .. Place your references here:
 .. _bob: https://www.idiap.ch/software/bob
-.. _installation: https://gitlab.idiap.ch/bob/bob/wikis/Installation
+.. _installation: https://www.idiap.ch/software/bob/install
 .. _mailing list: https://groups.google.com/forum/?fromgroups#!forum/bob-devel
diff --git a/doc/links.rst b/doc/links.rst
index e6df9b37b30490bb53f48e0d895760f35b9d57ef..f48ed9b376c881189736e7d0eb7c18efac778672 100644
--- a/doc/links.rst
+++ b/doc/links.rst
@@ -50,7 +50,7 @@
 .. _python: http://www.python.org
 .. _pypi: http://pypi.python.org
 .. _qt4: http://qt.nokia.com/
-.. _satellite packages: https://gitlab.idiap.ch/bob/bob/wikis/Packages
+.. _satellite packages: https://www.idiap.ch/software/bob/packages
 .. _scipy: http://www.scipy.org
 .. _setuptools: http://trac.edgewall.org/wiki/setuptools
 .. _sphinx: http://sphinx.pocoo.org