diff --git a/CHANGES.txt b/CHANGES.txt
index a89a11a279..d5eb1048dc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,7 @@
 3.11.17
  * Fix NPE when using udfContext in UDF after a restart of a node (CASSANDRA-18739)
 Merged from 3.0:
+ * Add cqlshrc.sample and credentials.sample into Debian package (CASSANDRA-18818)
  * Refactor validation logic in StorageService.rebuild (CASSANDRA-18803)
  * Make alternation of a user type validate the same way as creation of a user type does (CASSANDRA-18585)
  * Backport of CASSANDRA-16905 Further restrict schema column drop/recreate conversions (CASSANDRA-18760)
diff --git a/debian/cassandra.install b/debian/cassandra.install
index b50552a2ee..3b536d507e 100644
--- a/debian/cassandra.install
+++ b/debian/cassandra.install
@@ -7,6 +7,7 @@ conf/logback.xml etc/cassandra
 conf/logback-tools.xml etc/cassandra
 conf/jvm.options etc/cassandra
 conf/hotspot_compiler etc/cassandra
+conf/cqlshrc.sample etc/cassandra
 conf/triggers/* etc/cassandra/triggers
 debian/cassandra.in.sh usr/share/cassandra
 debian/cassandra.conf etc/security/limits.d