diff --git a/CHANGES.txt b/CHANGES.txt
index c6c51c3809..b8c3963451 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,7 @@
 2.0.9
  * Add missing iso8601 patterns for date strings (6973)
  * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
+ * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
 
 2.0.8
  * Always reallocate buffers in HSHA (CASSANDRA-6285)
diff --git a/bin/cqlsh b/bin/cqlsh
index 6575387240..75c42994a5 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -1136,10 +1136,10 @@ class Shell(cmd.Cmd):
 
         out.write("  PRIMARY KEY (")
         partkeynames = self.cql_protect_names(layout.partition_key_columns)
-        if len(partkeynames) > 1:
-            partkey = "(%s)" % ', '.join(partkeynames)
-        else:
-            partkey = partkeynames[0]
+
+        # Changed to put parenthesis around one or more partition keys in CASSANDRA-7274
+        partkey = "(%s)" % ', '.join(partkeynames)
+
         pk_parts = [partkey] + self.cql_protect_names(layout.clustering_key_columns)
         out.write(', '.join(pk_parts) + ')')