diff --git a/CHANGES.txt b/CHANGES.txt
index e6020deee1..b3752f7d19 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -130,6 +130,8 @@
  * Add nodetool statushandoff/statusbackup (CASSANDRA-8912)
  * Use stdout for progress and stats in sstableloader (CASSANDRA-8982)
 Merged from 2.0:
+ * (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 3345b7a519..e72b546b3e 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -2146,8 +2146,10 @@ def read_options(cmdlineargs, environment):
                                                     DEFAULT_DATE_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.max_trace_wait = option_with_default(configs.getfloat, 'tracing', 'max_trace_wait',
                                                    DEFAULT_MAX_TRACE_WAIT)
+
     optvalues.debug = False
     optvalues.file = None
     optvalues.ssl = False
@@ -2235,6 +2237,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