diff --git a/doc/faq.rst b/doc/faq.rst
index 36a4e5aaf71c..1210aa24894d 100644
--- a/doc/faq.rst
+++ b/doc/faq.rst
@@ -1000,6 +1000,14 @@ for the appropriate type. If you know you will be adding larger items
 to that column then you should manually adjust the column sizes
 accordingly. This is done for the sake of efficiency.
 
+.. _faq3_20:
+
+3.20 After upgrading, some bookmarks are gone or their content cannot be shown.
+-------------------------------------------------------------------------------
+
+At some point, the character set used to store bookmark content has changed.
+It's better to recreate your bookmark from the newer phpMyAdmin version.
+
 .. _faqmultiuser:
 
 ISPs, multi-user installations