diff --git a/ChangeLog b/ChangeLog
index 3b37f64a7..7ea8f7531 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 3.1.0.0 (not yet released)
 - bug #2046883 [core] Notices about deprecated dl() (so stop using it)
 + BLOBstreaming support, thanks to Raj Kissu Rajandran (work in progress)
++ patch #2067462 [lang] link FAQ references in messages,
+  thanks to Thijs Kinkhorst - kink
 
 3.0.0.0 (not yet released)
 + [export] properly handle line breaks for YAML, thanks to Dan Barry -
diff --git a/db_structure.php b/db_structure.php
index 7174930ac..72b1d6ec8 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -96,7 +96,7 @@ function PMA_TableHeader($db_is_information_schema = false)
         .'        ' . $GLOBALS['strAction'] . "\n"
         .'    </th>'
         .'    <th>' . $GLOBALS['strRecords']
-        .PMA_showHint($GLOBALS['strApproximateCount']) . "\n"
+        .PMA_showHint(PMA_sanitize($GLOBALS['strApproximateCount'])) . "\n"
         .'    </th>' . "\n";
     if (!($GLOBALS['cfg']['PropertiesNumColumns'] > 1)) {
         echo '    <th>' . $GLOBALS['strType'] . '</th>' . "\n";
diff --git a/lang/english-utf-8.inc.php b/lang/english-utf-8.inc.php
index 678790a66..49f49a39d 100644
--- a/lang/english-utf-8.inc.php
+++ b/lang/english-utf-8.inc.php
@@ -62,7 +62,7 @@ $strAnIndex = 'An index has been added on %s';
 $strAny = 'Any';
 $strAnyHost = 'Any host';
 $strAnyUser = 'Any user';
-$strApproximateCount = 'May be approximate. See FAQ 3.11';
+$strApproximateCount = 'May be approximate. See [a@./Documentation.html#faq3_11@Documentation]FAQ 3.11[/a]';
 $strAPrimaryKey = 'A primary key has been added on %s';
 $strArabic = 'Arabic';
 $strArmenian = 'Armenian';
@@ -304,7 +304,7 @@ $strExtra = 'Extra';
 $strFailedAttempts = 'Failed attempts';
 $strField = 'Field';
 $strFieldHasBeenDropped = 'Field %s has been dropped';
-$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11';
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see [a@./Documentation.html#faq1_11@Documentation]FAQ 1.11[/a]';
 $strFieldsEnclosedBy = 'Fields enclosed by';
 $strFieldsEscapedBy = 'Fields escaped by';
 $strFields = 'Fields';
@@ -510,7 +510,7 @@ $strNext = 'Next';
 $strNoActivity = 'No activity within %s seconds; please log in again';
 $strNoDatabases = 'No databases';
 $strNoDatabasesSelected = 'No databases selected.';
-$strNoDataReceived = 'No data was received to import. Either no file name was submitted, or the file size exceeded the maximum size permitted by your PHP configuration. See FAQ 1.16.';
+$strNoDataReceived = 'No data was received to import. Either no file name was submitted, or the file size exceeded the maximum size permitted by your PHP configuration. See [a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a].';
 $strNoDescription = 'no description';
 $strNoDetailsForEngine = 'There is no detailed status information available for this storage engine.';
 $strNoDropDatabases = '"DROP DATABASE" statements are disabled.';
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 8b1ef45c3..c0cff8b49 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -1759,7 +1759,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
       || $analyzed_sql[0]['where_clause'] == '1 ')) {
         // "j u s t   b r o w s i n g"
         $pre_count = '~';
-        $after_count = PMA_showHint($GLOBALS['strApproximateCount'], true);
+        $after_count = PMA_showHint(PMA_sanitize($GLOBALS['strApproximateCount']), true);
     } else {
         $pre_count = '';
         $after_count = '';