diff --git a/doc/FAQ b/doc/FAQ
index 6ae1a8d19e..373223a40f 100644
--- a/doc/FAQ
+++ b/doc/FAQ
@@ -639,7 +639,7 @@
     
    These are the limits:
 Maximum size for a database?             unlimited (60GB databases exist)
-Maximum size for a table?                64 TB on all operating systems
+Maximum size for a table?                16 TB
 Maximum size for a row?                  unlimited in 7.1 and later
 Maximum size for a field?                1GB in 7.1 and later
 Maximum number of rows in a table?       unlimited
@@ -650,6 +650,13 @@ Maximum number of indexes on a table?    unlimited
    disk space and memory/swap space. Performance may suffer when these
    values get unusually large.
    
+   The maximum table size of 16TB does not require large file support
+   from the operating system. Large tables are stored as multiple 1GB
+   files.
+   
+   The maximum table size and maximum number of columns can be increased
+   by four if the default block size is increased to 32k.
+   
     4.7) How much database disk space is required to store data from a typical
     text file?
     
diff --git a/doc/src/FAQ/FAQ.html b/doc/src/FAQ/FAQ.html
index 9d2634467c..e180b923e3 100644
--- a/doc/src/FAQ/FAQ.html
+++ b/doc/src/FAQ/FAQ.html
@@ -831,7 +831,7 @@
     <P>These are the limits:</P>
 <PRE>
 Maximum size for a database?             unlimited (60GB databases exist)
-Maximum size for a table?                64 TB on all operating systems
+Maximum size for a table?                16 TB
 Maximum size for a row?                  unlimited in 7.1 and later
 Maximum size for a field?                1GB in 7.1 and later
 Maximum number of rows in a table?       unlimited
@@ -842,6 +842,13 @@ Maximum number of indexes on a table?    unlimited
     available disk space and memory/swap space.  Performance may
     suffer when these values get unusually large.
 
+    <P>The maximum table size of 16TB does not require large file
+    support from the operating system.  Large tables are stored
+    as multiple 1GB files.
+    
+    <P>The maximum table size and maximum number of columns can be
+    increased by four if the default block size is increased to 32k.
+
     <H4><A name="4.7">4.7</A>) How much database disk space is required
     to store data from a typical text file?<BR>
     </H4>