diff --git a/docs/conf.py b/docs/conf.py
index 21a65209..a1aec88c 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -41,7 +41,8 @@ extensions = [
     'sphinx.ext.intersphinx',
     'sphinx.ext.todo',
     'sphinx.ext.viewcode',
-    'sphinxcontrib.plantuml'
+    'sphinxcontrib.plantuml',
+    'sphinx.ext.autosectionlabel'
 ]
 
 # Add any paths that contain templates here, relative to this directory.
@@ -170,3 +171,6 @@ plantuml_output_format = 'svg'
 
 # favicon
 html_favicon = 'img/favicon.ico'
+
+# autosectionlabel
+autosectionlabel_prefix_document = True
\ No newline at end of file
diff --git a/docs/index.rst b/docs/index.rst
index ba13b3e5..d3013aae 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -15,6 +15,7 @@ This is the documentation and API of the `eReuse.org DeviceHub
     events
     tags
     inventory
+    etag
 
 * :ref:`genindex`
 * :ref:`modindex`
diff --git a/docs/tags.rst b/docs/tags.rst
index 7bc15056..ef170ffd 100644
--- a/docs/tags.rst
+++ b/docs/tags.rst
@@ -25,8 +25,8 @@ parametrizing an ID generator.
 Note that these virtual tags don't have to forcefully be printed or
 have a physical representation (this is not imposed at system level).
 
-The eReuse.org tags (eTag)
-**************************
+eTags
+*****
 We recognize a special type of tag, the **eReuse.org tags (eTag)**.
 These are tags defined by eReuse.org and that can be issued only
 by tag providers that comply with the eReuse.org requisites.