diff --git a/lib/emoji-data/readme_moodle.txt b/lib/emoji-data/readme_moodle.txt
index 5286c519ea5..a0b4eb5e183 100644
--- a/lib/emoji-data/readme_moodle.txt
+++ b/lib/emoji-data/readme_moodle.txt
@@ -7,6 +7,26 @@ Description of emoji data import into Moodle.
 3. Run the generate_emoji_data.php script to create the new data.js file
    E.g. php lib/emoji-data/generate_emoji_data.php > lib/amd/src/emoji/data.js
 
+   Once this command has been executed, open the newly created lib/amd/src/emoji/data.js file and make sure that the
+   emoji data has been successfully generated.
+   ==================================================================================================================
+   NOTE: If the following error messages are displayed instead of the emoji data in data.js you should:
+   * 'The following categories are missing: xyz, xyz, ...'
+      1. add these categories in $categorysortorder in generate_emoji_data.php
+      2. include these categories in the emoji picker template (lib/templates/emoji/picker.mustache).
+      3. add appropriate icon mappings for these categories in get_core_icon_map() in
+         lib/classes/output/icon_system_fontawesome.php.
+      4. add language strings for these categories in lang/en/moodle.php.
+   * 'The following categories are no longer used: xyz, xyz, ...'
+      1. remove these categories from $categorysortorder in generate_emoji_data.php
+      2. remove these categories from the emoji picker template (lib/templates/emoji/picker.mustache).
+      3. remove the icon mappings for these categories in get_core_icon_map() in
+         lib/classes/output/icon_system_fontawesome.php.
+      4. remove (deprecate) the language strings for these categories in lang/en/moodle.php.
+
+   Rerun 'php lib/emoji-data/generate_emoji_data.php > lib/amd/src/emoji/data.js'
+   ==================================================================================================================
+
 4. Build the new emoji data.js file
    E.g. grunt amd --files=lib/amd/src/emoji/data.js
 
diff --git a/lib/thirdpartylibs.xml b/lib/thirdpartylibs.xml
index bdeb8a44972..d584732a1f9 100644
--- a/lib/thirdpartylibs.xml
+++ b/lib/thirdpartylibs.xml
@@ -325,7 +325,7 @@
     <location>emoji-data</location>
     <name>Emoji data</name>
     <license>MIT</license>
-    <version>4.1.0</version>
+    <version>6.0.0</version>
   </library>
   <library>
     <location>polyfills</location>
diff --git a/lib/upgrade.txt b/lib/upgrade.txt
index 9958ae14448..4cee02afd29 100644
--- a/lib/upgrade.txt
+++ b/lib/upgrade.txt
@@ -21,6 +21,7 @@ information provided here is intended especially for developers.
 * A new optional parameter `$sort` has been added to all `$context->get_capabilities()` methods to be able to define order of
   returned capability array.
 * Spout has been upgraded to the latest version - 3.1.0
+* emoji-data has been upgraded to 6.0.0.
 
 === 3.10 ===
 * PHPUnit has been upgraded to 8.5. That comes with a few changes: