diff --git a/CHANGES.txt b/CHANGES.txt
index e725cadc68..8a05b7d9cc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 1.0.6
+ * (CQL) fix cqlsh support for replicate_on_write (CASSANDRA-3596)
  * fix adding to leveled manifest after streaming (CASSANDRA-3536)
  * filter out unavailable cipher suites when using encryption (CASSANDRA-3178)
  * (HADOOP) add old-style api support for CFIF and CFRR (CASSANDRA-2799)
diff --git a/pylib/cqlshlib/cqlhandling.py b/pylib/cqlshlib/cqlhandling.py
index 2df80610c6..30c22fb9d9 100644
--- a/pylib/cqlshlib/cqlhandling.py
+++ b/pylib/cqlshlib/cqlhandling.py
@@ -37,7 +37,7 @@ columnfamily_options = (
     ('max_compaction_threshold', None),
     ('row_cache_save_period_in_seconds', None),
     ('key_cache_save_period_in_seconds', None),
-    ('replication_on_write', 'replicate_on_write')
+    ('replicate_on_write', None)
 )
 
 cql_type_to_apache_class = {