diff --git a/doc/buildsystem.rst b/doc/buildsystem.rst
index 8d59f3b901d2b65d796687817a2791c872afd9b6..c4124270a1741bec5e4448b7ca28d39b0f812fe3 100644
--- a/doc/buildsystem.rst
+++ b/doc/buildsystem.rst
@@ -5,7 +5,7 @@ Dependencies
 --------------------------------------------------------------------------------
 |project| is build on top of |ost_l|_ (|ost_s|) and needs at least version
 1.4. To create the build system, |cmake|_ is required in version 2.8.7 or
-higher. |python|_ works well from version 2.7. For |ost_s| and the C++ bit of
+higher. |python|_ works well from version 2.7. For |ost_s| and the |C++| bit of
 |project|, |boost|_ is required in version 1.47.0. To build documentation,
 |sphinx|_ 1.2b1 is used.
 
diff --git a/doc/conf.py.in b/doc/conf.py.in
index 961c5e0f8a3268a49bf00bc330c43e40409524d8..35007a2a7c2b60ee6661c941cacff52662574aa3 100644
--- a/doc/conf.py.in
+++ b/doc/conf.py.in
@@ -262,8 +262,10 @@ rst_epilog = """
 .. |sphinx| replace:: Sphinx
 .. _sphinx: http://sphinx-doc.org/
 .. |restructuredtext| replace:: reStructuredText
+.. |restructuredtext_abrv| replace:: reST
 .. |boost| replace:: Boost
 .. |git| replace:: Git
+.. |C++| replace:: C++
 """ % project
 # in some versions of sphinx, doctest invokes doctest_path AFTER executing code
 doctest_global_setup = """