diff --git a/CHANGES.txt b/CHANGES.txt
index 983246916f..43030317c4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -34,6 +34,7 @@
  * Configurable client timeout for cqlsh (CASSANDRA-7516)
  * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
 Merged from 2.0:
+ * (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577)
  * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252)
  * (cqlsh) cqlsh should automatically disable tracing when selecting
    from system_traces (CASSANDRA-7641)
@@ -46,6 +47,7 @@ Merged from 2.0:
  * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345)
  * cqlsh fails when version number parts are not int (CASSANDRA-7524)
 
+
 2.1.0
  * Fix ordering of static cells (CASSANDRA-7763)
 Merged from 2.0:
diff --git a/bin/cqlsh b/bin/cqlsh
index 622fd07469..74ba7bbd5b 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -738,6 +738,7 @@ class Shell(cmd.Cmd):
                 if readline.__doc__ is not None and 'libedit' in readline.__doc__:
                     readline.parse_and_bind("bind -e")
                     readline.parse_and_bind("bind '" + self.completekey + "' rl_complete")
+                    readline.parse_and_bind("bind ^R em-inc-search-prev")
                 else:
                     readline.parse_and_bind(self.completekey + ": complete")
         try: