diff --git a/doc/cplusplus_library.rst b/doc/cplusplus_library.rst
index 68b72eaa44a128241b7f7aeb3c122d7d0db59945..5a579b904617c3b1a0f0b55b1fe1872031547573 100644
--- a/doc/cplusplus_library.rst
+++ b/doc/cplusplus_library.rst
@@ -69,7 +69,7 @@ If you would like to generate a Library out of your C++ code, simply add it in t
 
 
 Again, we use the overloaded library class
-:py:class:`bob.blitz.extension.Library` instead of the
+``bob.blitz.extension.Library`` instead of the
 :py:class:`bob.extension.Library`, but the parameters are identical, and
 identical to the ones of the :py:class:`bob.extension.Extension`.  To avoid
 later complications, you should follow the guidelines for libraries in bob
diff --git a/doc/cplusplus_modules.rst b/doc/cplusplus_modules.rst
index 34dfec16f4f165fdea6b46601178b7293fe4cd63..d595364638d4f8a582a9e60b4c3c1a9fc6ef97fa 100644
--- a/doc/cplusplus_modules.rst
+++ b/doc/cplusplus_modules.rst
@@ -61,7 +61,7 @@ As the second step, we need to add some lines in the header of the file to tell
   build_requires = setup_packages + bob_packages + load_requirements()
 
 In fact, we don't use the extension from :py:class:`bob.extension.Extension`, but the one from ``bob.blitz.extension``, which is a derivation of this package.
-The difference is that in :py:class:`bob.blitz.extension.Extension` all header files and libraries for the ``Blitz++`` library are added.
+The difference is that in ``bob.blitz.extension.Extension`` all header files and libraries for the ``Blitz++`` library are added.
 
 Third, we have to add an extension using the ``Extension`` class, by listing all C/C++ files that should be compiled into the extension:
 
diff --git a/doc/extra-intersphinx.txt b/doc/extra-intersphinx.txt
index 5fa37b407129756f6d6e620192a43a1d55988993..caf49d26d6307f5c143b84319c39a7464ac3925d 100644
--- a/doc/extra-intersphinx.txt
+++ b/doc/extra-intersphinx.txt
@@ -1,4 +1,3 @@
 python
 click
-bob.blitz
 bob.bio.base
diff --git a/doc/links.rst b/doc/links.rst
index 018ad07bfc3d420b12d1e1371d042197e82542c2..f638bfd3ba60a5b35d91030727da1fc1f777c4ae 100644
--- a/doc/links.rst
+++ b/doc/links.rst
@@ -25,7 +25,6 @@
 .. _sphinx: http://sphinx.pocoo.org
 .. _zc.buildout: http://pypi.python.org/pypi/zc.buildout/
 .. _mr.developer: http://pypi.python.org/pypi/mr.developer/
-.. _bob.blitz: https://gitlab.idiap.ch/bob/bob.blitz
 .. _pip: https://pip.pypa.io/en/stable/
 .. _pip's user guide: https://pip.pypa.io/en/stable/user_guide/
 .. _napoleon: https://sphinxcontrib-napoleon.readthedocs.io/en/latest/
diff --git a/doc/pure_python.rst b/doc/pure_python.rst
index 0f19adfc6e80bc0abd7dd55048f5d9a33d66f6f7..4c6a260d020b95effeb8d28bcca8213a49b8d126 100644
--- a/doc/pure_python.rst
+++ b/doc/pure_python.rst
@@ -96,7 +96,7 @@ The package you cloned above is a pure-Python example package and contains all
 elements to get you started.  It defines a single library module called
 ``bob.example.project``, which declares a simple script, called ``version.py``
 that prints out the version of the dependent library
-:ref:`bob.blitz <bob.blitz>`. These information is available in your
+``bob.blitz``. These information is available in your
 ``setup.py`` file and particularly in its ``setup`` function:
 
 .. code-block:: python