diff --git a/modules/edocument_unece/CHANGELOG b/modules/edocument_unece/CHANGELOG
index d5a9e58f0d..150371e900 100644
--- a/modules/edocument_unece/CHANGELOG
+++ b/modules/edocument_unece/CHANGELOG
@@ -20,28 +20,36 @@ Version 6.6.0 - 2022-10-31
 * Bug fixes (see mercurial logs for details)
 
 Version 6.4.0 - 2022-05-02
+--------------------------
 * Bug fixes (see mercurial logs for details)
 * Add support for Python 3.10
 * Remove support for Python 3.6
 
 Version 6.2.0 - 2021-11-01
+--------------------------
 * Bug fixes (see mercurial logs for details)
 
 Version 6.0.0 - 2021-05-03
+--------------------------
 * Bug fixes (see mercurial logs for details)
 
 Version 5.8.0 - 2020-11-02
+--------------------------
 * Bug fixes (see mercurial logs for details)
 * Remove support for Python 3.5
 
 Version 5.6.0 - 2020-05-04
+--------------------------
 * Bug fixes (see mercurial logs for details)
 
 Version 5.4.0 - 2019-11-04
+--------------------------
 * Bug fixes (see mercurial logs for details)
 
 Version 5.2.0 - 2019-05-06
+--------------------------
 * Bug fixes (see mercurial logs for details)
 
 Version 5.0.0 - 2018-10-01
+--------------------------
 * Initial release
diff --git a/modules/edocument_unece/doc/design.rst b/modules/edocument_unece/doc/design.rst
new file mode 100644
index 0000000000..d77638509b
--- /dev/null
+++ b/modules/edocument_unece/doc/design.rst
@@ -0,0 +1,34 @@
+******
+Design
+******
+
+The *EDocument UNECE Module* extends the following concepts:
+
+.. _model-product.uom:
+
+Unit of Measure
+===============
+
+The *Unit of Measures* gains a new property to store the `UNECE recommendation
+No. 20 code
+<https://tfig.unece.org/instruments/recommendations-and-standards/unece-and-uncefact-recommendations/recommendation-no-20>`_.
+
+.. seealso::
+
+   The `Unit of Measure <product:model-product.uom>` concept is introduced by
+   the :doc:`Product Module <product:index>`.
+
+.. _model-account.tax:
+
+Tax
+===
+
+The *Tax* gains new properties to store the `UNECE code 5153
+<https://unece.org/fileadmin/DAM/trade/untdid/d16b/tred/tred5153.htm>`_ and the
+`UNECE category code 5305
+<https://unece.org/fileadmin/DAM/trade/untdid/d16b/tred/tred5305.htm>`_
+
+.. seealso::
+
+   The `Tax <account:model-account.tax>` concept is introduced by the
+   :doc:`Account Module <account:index>`.
diff --git a/modules/edocument_unece/doc/index.rst b/modules/edocument_unece/doc/index.rst
index d2aa85bd83..eade94dfb6 100644
--- a/modules/edocument_unece/doc/index.rst
+++ b/modules/edocument_unece/doc/index.rst
@@ -1,14 +1,12 @@
+######################
 EDocument UNECE Module
 ######################
 
-The module adds many codes from the UNECE:
+The *EDocument UNECE Module* adds support for `UNECE <https://unece.org/>`_
+codes.
 
-    * `Recommendation N°. 20 Codes for Units of Measure Used in International
-      Trade
-      <https://tfig.unece.org/instruments/recommendations-and-standards/unece-and-uncefact-recommendations/recommendation-no-20/>`_
+.. toctree::
+   :maxdepth: 2
 
-    * `5153  Duty or tax or fee type name code
-      <https://unece.org/fileadmin/DAM/trade/untdid/d16b/tred/tred5153.htm>`_
-
-    * `5305  Duty or tax or fee category code
-      <https://unece.org/fileadmin/DAM/trade/untdid/d16b/tred/tred5305.htm>`_
+   design
+   releases
diff --git a/modules/edocument_unece/doc/releases.rst b/modules/edocument_unece/doc/releases.rst
new file mode 100644
index 0000000000..21b13c4745
--- /dev/null
+++ b/modules/edocument_unece/doc/releases.rst
@@ -0,0 +1,7 @@
+.. _releases-index:
+
+=============
+Release notes
+=============
+
+.. include:: ../CHANGELOG
diff --git a/modules/edocument_unece/setup.py b/modules/edocument_unece/setup.py
index ada1373c81..0bbf7c833a 100755
--- a/modules/edocument_unece/setup.py
+++ b/modules/edocument_unece/setup.py
@@ -11,9 +11,12 @@ from setuptools import find_packages, setup
 
 
 def read(fname):
-    return io.open(
+    content = io.open(
         os.path.join(os.path.dirname(__file__), fname),
         'r', encoding='utf-8').read()
+    content = re.sub(
+        r'(?m)^\.\. toctree::\r?\n((^$|^\s.*$)\r?\n)*', '', content)
+    return content
 
 
 def get_require_version(name):
@@ -59,7 +62,8 @@ setup(name=name,
     download_url=download_url,
     project_urls={
         "Bug Tracker": 'https://bugs.tryton.org/',
-        "Documentation": 'https://docs.tryton.org/',
+        "Documentation": (
+            'https://docs.tryton.org/latest/modules-edocument-unece'),
         "Forum": 'https://www.tryton.org/forum',
         "Source Code": 'https://code.tryton.org/tryton',
         },