diff --git a/CHANGES.txt b/CHANGES.txt
index d7395a6a7e..9c0bc6bfdc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -23,6 +23,7 @@
    (CASSANDRA-6347)
  * Disallow altering CQL3 table from thrift (CASSANDRA-6370)
  * Fix size computation of prepared statement (CASSANDRA-6369)
+ * Bump Xss to 256k (CASSANDRA-5517)
 
 
 1.2.11
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index 4fd1855346..52d91b6b75 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -190,7 +190,7 @@ if [ "`uname`" = "Linux" ] ; then
     # be pooled anyway.) Only do so on Linux where it is known to be
     # supported.
     # u34 and greater need 180k
-    JVM_OPTS="$JVM_OPTS -Xss180k"
+    JVM_OPTS="$JVM_OPTS -Xss256k"
 fi
 echo "xss = $JVM_OPTS"