diff --git a/README.rst b/README.rst
index f9b3efbd9ec87753960ebe782d0e0b49e3c91f37..72f1cfce2b4ee0dbbd072cbee4a0d0a5d56c989b 100644
--- a/README.rst
+++ b/README.rst
@@ -1,9 +1,9 @@
 .. vim: set fileencoding=utf-8 :
 .. Fri 19 Aug 2016 13:32:51 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.bio.vein/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.bio.vein/master/index.html
 .. image:: https://gitlab.idiap.ch/bob/bob.bio.vein/badges/v2.1.0/build.svg
    :target: https://gitlab.idiap.ch/bob/bob.bio.vein/commits/v2.1.0
@@ -44,6 +44,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
 .. _bob.bio.base: https://pypi.python.org/pypi/bob.bio.base
diff --git a/doc/links.rst b/doc/links.rst
index 917976a3856732483f225f23e8dc7d94ba066bb9..bb320b1117d90350c86a3f696d945352fed84821 100644
--- a/doc/links.rst
+++ b/doc/links.rst
@@ -5,12 +5,7 @@
 .. This file contains all links we use for documentation in a centralized place
 
 .. _idiap: http://www.idiap.ch
-.. _github: http://www.github.com/idiap
 .. _bob: http://www.idiap.ch/software/bob
-.. _github bug reporting system: http://github.com/bioidiap/fingervein/issues
-.. _idiap at github: http://www.github.com/bioidiap
-.. _bob's github page: http://idiap.github.com/bob
-.. _gridtk: http://github.com/idiap/gridtk
 .. _buildout: http://www.buildout.org
 .. _nist: http://www.nist.gov/itl/iad/ig/focs.cfm
 .. _pypi: http://pypi.python.org
@@ -20,7 +15,7 @@
 .. _vera fingervein: https://www.idiap.ch/dataset/vera-fingervein
 .. _utfvp: http://scs.ewi.utwente.nl/downloads/show,Finger%20Vein/
 .. _put: http://biometrics.put.poznan.pl/vein-dataset/
-.. _installation: https://gitlab.idiap.ch/bob/bob/wikis/Installation
+.. _installation: https://www.idiap.ch/software/bob/install
 .. _dependencies: https://gitlab.idiap.ch/bob/bob/wikis/Dependencies
 .. _mailing list: https://groups.google.com/forum/?fromgroups#!forum/bob-devel
 .. _bob.bio.base: https://pypi.python.org/pypi/bob.bio.base