diff --git a/runtime/doc/fold.txt b/runtime/doc/fold.txt
index f2f6c70b0c..8e2cb2f728 100644
--- a/runtime/doc/fold.txt
+++ b/runtime/doc/fold.txt
@@ -527,8 +527,7 @@ FOLDCOLUMN						*fold-foldcolumn*
 
 'foldcolumn' is a number, which sets the width for a column on the side of the
 window to indicate folds.  When it is zero, there is no foldcolumn.  A normal
-value is 4 or 5.  The minimal useful value is 2, although 1 still provides
-some information.  The maximum is 12.
+value is auto:9. The maximum is 9.
 
 An open fold is indicated with a column that has a '-' at the top and '|'
 characters below it.  This column stops where the open fold stops.  When folds
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 7107a0135d..283b2c3f12 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -2421,11 +2421,14 @@ A jump table for the options with a short description can be found at |Q_op|.
 	automatically close when moving out of them.
 
 						*'foldcolumn'* *'fdc'*
-'foldcolumn' 'fdc'	number (default 0)
+'foldcolumn' 'fdc'	string (default "0")
 			local to window
-	When non-zero, a column with the specified width is shown at the side
-	of the window which indicates open and closed folds.  The maximum
-	value is 12.
+	When and how to draw the foldcolumn. Valid values are:
+	    "auto":       resize to the maximum amount of folds to display.
+	    "auto:[1-9]": resize to accommodate multiple folds up to the
+			  selected level
+            0:            to disable foldcolumn
+	    "[1-9]":      to display a fixed number of columns
 	See |folding|.
 
 			*'foldenable'* *'fen'* *'nofoldenable'* *'nofen'*
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 5835c7f314..376375e4ef 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -201,6 +201,7 @@ Options:
   'guicursor'   works in the terminal
   'fillchars'   flags: "msgsep" (see 'display'), "eob" for |hl-EndOfBuffer|
                 marker, "foldopen", "foldsep", "foldclose"
+  'foldcolumn'  supports up to 9 dynamic/fixed columns
   'inccommand'  shows interactive results for |:substitute|-like commands
   'listchars'   local to window
   'pumblend'    pseudo-transparent popupmenu