diff --git a/credits.rst b/credits.rst
index 596ad99834..ad1bf41a85 100644
--- a/credits.rst
+++ b/credits.rst
@@ -179,9 +179,9 @@ Credits, in chronological order
 * Maxime Delorme <delorme.maxime\_at\_free.fr>
 
   * :abbr:`PDF (Portable Document Format)` schema output, thanks also to
-    Olivier Plathey for the "FPDF" library (see `http://www.fpdf.org/
-    <http://www.fpdf.org/>`_) and Steven Wittens for the "UFPDF" library
-    (see `http://www.acko.net/node/56 <http://www.acko.net/node/56>`_).
+    Olivier Plathey for the "FPDF" library (see <http://www.fpdf.org/>), Steven
+    Wittens for the "UFPDF" library (see <http://www.acko.net/node/56>) and
+    Nicola Asuni for the "TCPDF" library (see <http://www.tcpdf.org/>).
 
 * Olof Edlund <olof.edlund\_at\_upright.se>
 
diff --git a/faq.rst b/faq.rst
index b9a784a9c5..f974c7d07a 100644
--- a/faq.rst
+++ b/faq.rst
@@ -232,9 +232,9 @@ Documentation <http://dev.mysql.com/doc/mysql/en/old-client.html>`_.
 1.19 I can't run the "display relations" feature because the script seems not to know the font face I'm using!
 --------------------------------------------------------------------------------------------------------------
 
-The "FPDF" library we're using for this feature requires some special
-files to use font faces. Please refers to the `FPDF manual
-<http://www.fpdf.org/>`_ to build these files.
+The "TCPDF" library we're using for this feature requires some special
+files to use font faces. Please refers to the `TCPDF manual
+<http://www.tcpdf.org/>`_ to build these files.
 
 .. _faqmysql:
 
diff --git a/glossary.rst b/glossary.rst
index a39a46a3f7..e5d4cd938d 100644
--- a/glossary.rst
+++ b/glossary.rst
@@ -336,13 +336,18 @@ From Wikipedia, the free encyclopedia
 
       .. seealso:: <http://www.wikipedia.org/wiki/TCP>
 
+    TCPDF
+      Rewrite of :term:`UFPDF` with various improvements.
+
+      .. seealso:: <http://www.tcpdf.org/>
+
     trigger
       a procedural code that is automatically executed in response to certain events on a particular table or view in a database	
 
       .. seealso:: <http://en.wikipedia.org/wiki/Database_trigger>
 
     UFPDF
-      Unicode/UTF-8 extension for FPDF	
+      Unicode/UTF-8 extension for :term:`FPDF`
 
       .. seealso:: <http://www.acko.net/node/56>