diff --git a/ChangeLog.rst b/ChangeLog.rst
index 2e51dbfcc..8e141d1de 100644
--- a/ChangeLog.rst
+++ b/ChangeLog.rst
@@ -1,5 +1,5 @@
-python-gitlab Changelog
-=======================
+ChangeLog
+=========
 
 Version 0.19_ - 2017-02-21
 ---------------------------
diff --git a/RELEASE_NOTES.rst b/RELEASE_NOTES.rst
index 669e00ed3..d107aaa23 100644
--- a/RELEASE_NOTES.rst
+++ b/RELEASE_NOTES.rst
@@ -1,6 +1,6 @@
-###############################
-Release notes for python-gitlab
-###############################
+#############
+Release notes
+#############
 
 This page describes important changes between python-gitlab releases.
 
diff --git a/docs/api-objects.rst b/docs/api-objects.rst
index 010e9d650..78b964652 100644
--- a/docs/api-objects.rst
+++ b/docs/api-objects.rst
@@ -1,6 +1,6 @@
-########################
-API objects manipulation
-########################
+############
+API examples
+############
 
 .. toctree::
    :maxdepth: 1
diff --git a/docs/api/modules.rst b/docs/api/modules.rst
index 7b09ae1b6..3ec5a68fe 100644
--- a/docs/api/modules.rst
+++ b/docs/api/modules.rst
@@ -1,5 +1,5 @@
-gitlab
-======
+API documentation
+=================
 
 .. toctree::
    :maxdepth: 4
diff --git a/docs/changelog.rst b/docs/changelog.rst
new file mode 100644
index 000000000..91bdab9e7
--- /dev/null
+++ b/docs/changelog.rst
@@ -0,0 +1 @@
+.. include:: ../ChangeLog.rst
diff --git a/docs/index.rst b/docs/index.rst
index 54472fe43..a1df804da 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -11,6 +11,8 @@ Contents:
 .. toctree::
    :maxdepth: 2
 
+   changelog
+   release_notes
    install
    cli
    api-usage
diff --git a/docs/release_notes.rst b/docs/release_notes.rst
new file mode 100644
index 000000000..db74610a0
--- /dev/null
+++ b/docs/release_notes.rst
@@ -0,0 +1 @@
+.. include:: ../RELEASE_NOTES.rst