diff --git a/README.rst b/README.rst
index 347ab5c46fb77bb5694b448a2db9d27fc67d37de..c2d7c119ae6c80e8bca9d1f20c90a60a7b78dd19 100644
--- a/README.rst
+++ b/README.rst
@@ -1,9 +1,9 @@
 .. vim: set fileencoding=utf-8 :
 .. Sat 13 Aug 2016 00:24:52 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.ap/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.ap/master/index.html
 .. image:: https://gitlab.idiap.ch/bob/bob.ap/badges/master/build.svg
    :target: https://gitlab.idiap.ch/bob/bob.ap/commits/master
@@ -57,6 +57,6 @@ 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 b7b6baa78bc543e2626a2eb302e605d61a7c44bb..6b9825aa3144d864c834466c9110cb564e675441 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