diff --git a/CHANGES.txt b/CHANGES.txt
index 863f14546e..2073b00257 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
 2.0.14:
+ * (cqlsh) Allow increasing CSV field size limit through
+   cqlshrc config option (CASSANDRA-8934)
  * Stop logging range tombstones when exceeding the threshold
    (CASSANDRA-8559)
  * Fix NullPointerException when nodetool getendpoints is run
diff --git a/bin/cqlsh b/bin/cqlsh
index 6be9b785b0..a165dca67c 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -1964,6 +1964,8 @@ def read_options(cmdlineargs, environment):
                                                     DEFAULT_TIME_FORMAT)
     optvalues.float_precision = option_with_default(configs.getint, 'ui', 'float_precision',
                                                     DEFAULT_FLOAT_PRECISION)
+    optvalues.field_size_limit = option_with_default(configs.getint, 'csv', 'field_size_limit', csv.field_size_limit())
+
     optvalues.debug = False
     optvalues.file = None
     optvalues.tty = sys.stdin.isatty()
@@ -2046,6 +2048,7 @@ def main(options, hostname, port):
     setup_cqlruleset(options.cqlmodule)
     setup_cqldocs(options.cqlmodule)
     init_history()
+    csv.field_size_limit(options.field_size_limit)
 
     if options.file is None:
         stdin = None