diff --git a/doc/sources/admin/portalcustom.rst b/doc/sources/admin/portalcustom.rst
index 2b85ca266..a551cceed 100644
--- a/doc/sources/admin/portalcustom.rst
+++ b/doc/sources/admin/portalcustom.rst
@@ -290,6 +290,9 @@ For example ``templates/myskin/en.json``:
 You can also create a file called ``all.json`` to override messages in
 all languages.
 
+.. versionchanged:: 2.0.15
+   Translations in lemonldap-ng.ini now take priority over translations from skin files
+
 Menu tabs
 ~~~~~~~~~
 
diff --git a/doc/sources/admin/upgrade_2_0_x.rst b/doc/sources/admin/upgrade_2_0_x.rst
index 47e1dd707..2cf9d05d7 100644
--- a/doc/sources/admin/upgrade_2_0_x.rst
+++ b/doc/sources/admin/upgrade_2_0_x.rst
@@ -29,6 +29,22 @@ None
 2.0.15
 ------
 
+Translation overrides in lemonldap-ng.ini now take priority over skin
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Previously, the presence of a translation JSON file within a skin prevented
+translation messages defined in ``lemonldap-ng.ini`` from being used.
+
+Additionally, it was not possible to translate strings in email templates using
+a custom skin file.
+
+These two bugs are now fixed, be sure to check that you do not have duplicate
+translations in ``lemonldap-ng.ini`` and in your skin files (``*.json``). If you do,
+the translation in ``lemonldap-ng.ini`` will now take priority.
+
+See :ref:`documentation on translating messages <intlmessages>` for
+details
+
 New Captcha API
 ~~~~~~~~~~~~~~~