diff --git a/CHANGES.txt b/CHANGES.txt
index 7c66125b73..ffd5b31d1d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -21,6 +21,7 @@
  * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553)
  * Fix slice queries on ordered COMPACT tables (CASSANDRA-10988)
 Merged from 2.1:
+ * cqlsh: apply current keyspace to source command (CASSANDRA-11152)
  * Backport CASSANDRA-11578 (CASSANDRA-11750)
  * Clear out parent repair session if repair coordinator dies (CASSANDRA-11824)
  * Set default streaming_socket_timeout_in_ms to 24 hours (CASSANDRA-11840)
diff --git a/bin/cqlsh.py b/bin/cqlsh.py
index 85605ae532..dd0446a416 100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@ -1914,6 +1914,7 @@ class Shell(cmd.Cmd):
         subshell = Shell(self.hostname, self.port,
                          color=self.color, encoding=self.encoding, stdin=f,
                          tty=False, use_conn=self.conn, cqlver=self.cql_version,
+                         keyspace=self.current_keyspace,
                          display_timestamp_format=self.display_timestamp_format,
                          display_date_format=self.display_date_format,
                          display_nanotime_format=self.display_nanotime_format,