diff --git a/README.rst b/README.rst
index 192b68d721c0a300b3482977bd832a8a875c8623..ce73b9ac7a68ef5b02d10da4080a0587e5c32e48 100644
--- a/README.rst
+++ b/README.rst
@@ -1,9 +1,9 @@
 .. vim: set fileencoding=utf-8 :
 .. Sat Aug 20 07:33:55 CEST 2016
 
-.. 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.face/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.face/master/index.html
 .. image:: https://gitlab.idiap.ch/bob/bob.bio.face/badges/master/build.svg
    :target: https://gitlab.idiap.ch/bob/bob.bio.face/commits/master
@@ -53,5 +53,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/implementation.rst b/doc/implementation.rst
index 6b81375202aab3f58c047c557f7d64b4df55fbd6..d0c8a90dc041e2dd03b6e0b7c1450d83c9c9f74d 100644
--- a/doc/implementation.rst
+++ b/doc/implementation.rst
@@ -94,7 +94,7 @@ Databases
 ~~~~~~~~~
 
 One important aspect of :ref:`bob.bio.face <bob.bio.face>` is the relatively large list of supported image data sets, including well-defined evaluation protocols.
-All databases rely on the :py:class:`bob.bio.base.database.BioDatabase` interface, which in turn uses the `verification_databases <https://gitlab.idiap.ch/bob/bob/wikis/Packages>`_.
+All databases rely on the :py:class:`bob.bio.base.database.BioDatabase` interface, which in turn uses the `verification_databases <https://www.idiap.ch/software/bob/packages>`_.
 Please check the link above for information on how to obtain the original data of those data sets.
 
 After downloading and extracting the original data of the data sets, it is necessary that the scripts know, where the data was installed.
diff --git a/setup.py b/setup.py
index 9f800b5664f848b1f608293fb175bf0d9dcf1035..abe4c79a553bbae7f71b95bbe58b385a141b32e3 100644
--- a/setup.py
+++ b/setup.py
@@ -82,7 +82,7 @@ setup(
     #
     # Our database packages are good examples of namespace implementations
     # using several layers. You can check them out here:
-    # https://gitlab.idiap.ch/bob/bob/wikis/Packages
+    # https://www.idiap.ch/software/bob/packages
 
 
     # This entry defines which scripts you will have inside the 'bin' directory