diff --git a/doc/FAQ b/doc/FAQ
index 03413703d9e..ea8f83c3809 100644
--- a/doc/FAQ
+++ b/doc/FAQ
@@ -639,14 +639,16 @@
     
    These are the limits:
 Maximum size for a database?             unlimited (60GB databases exist)
-Maximum size for a table?                unlimited on all operating systems
+Maximum size for a table?                64 TB on all operating systems
 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
-Maximum number of columns in a table?    unlimited
+Maximum number of columns in a table?    1600
 Maximum number of indexes on a table?    unlimited
 
    Of course, these are not actually unlimited, but limited to available
-   disk space.
+   disk space and memory/swap space. Performance may suffer when these
+   values get unusually large.
    
     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 5102fc2e0fd..431456a9895 100644
--- a/doc/src/FAQ/FAQ.html
+++ b/doc/src/FAQ/FAQ.html
@@ -831,14 +831,16 @@
     <P>These are the limits:</P>
 <PRE>
 Maximum size for a database?             unlimited (60GB databases exist)
-Maximum size for a table?                unlimited on all operating systems
+Maximum size for a table?                64 TB on all operating systems
 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
-Maximum number of columns in a table?    unlimited
+Maximum number of columns in a table?    1600
 Maximum number of indexes on a table?    unlimited
 </PRE>
     Of course, these are not actually unlimited, but limited to
-    available disk space. 
+    available disk space and memory/swap space.  Performance may
+    suffer when these values get unusually large.
 
     <H4><A name="4.7">4.7</A>) How much database disk space is required
     to store data from a typical text file?<BR>