diff --git a/CHANGES.txt b/CHANGES.txt
index 3c217e27b2..b866d2d770 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -50,6 +50,7 @@
  * Make repair -pr work with -local (CASSANDRA-7450)
  * Fix error in sstableloader with -cph > 1 (CASSANDRA-8007)
 Merged from 2.0:
+ * Increase nodetool Xmx (CASSANDRA-7956)
  * Archive any commitlog segments present at startup (CASSANDRA-6904)
  * CrcCheckChance should adjust based on live CFMetadata not 
    sstable metadata (CASSANDRA-7978)
diff --git a/bin/nodetool b/bin/nodetool
index 9c6b7bd374..e81c59b5a3 100755
--- a/bin/nodetool
+++ b/bin/nodetool
@@ -87,7 +87,7 @@ case "`uname`" in
 esac
 
 "$JAVA" $JAVA_AGENT -cp "$CLASSPATH" \
-      -Xmx32m \
+      -Xmx128m \
       -Dcassandra.storagedir="$cassandra_storagedir" \
       -Dlogback.configurationFile=logback-tools.xml \
       -Dstorage-config="$CASSANDRA_CONF" \