diff --git a/CHANGES.txt b/CHANGES.txt
index af94bc85a9..86401d9d9c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,6 @@
 2.0.0
  * fix CAS contention timeout (CASSANDRA-5830)
+ * fix HsHa to respect max frame size (CASSANDRA-4573)
 
 
 2.0.0-rc1
diff --git a/build.xml b/build.xml
index a40405e724..a72adf4980 100644
--- a/build.xml
+++ b/build.xml
@@ -353,7 +353,7 @@
           <dependency groupId="com.googlecode.json-simple" artifactId="json-simple" version="1.1"/>
           <dependency groupId="com.github.stephenc.high-scale-lib" artifactId="high-scale-lib" version="1.1.2"/>
           <dependency groupId="com.github.stephenc" artifactId="jamm" version="0.2.5"/>
-	   <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.2.1"/>
+	   <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.0"/>
           <dependency groupId="org.yaml" artifactId="snakeyaml" version="1.6"/>
           <dependency groupId="org.apache.thrift" artifactId="libthrift" version="0.9.0"/>
 
@@ -451,7 +451,7 @@
         <dependency groupId="edu.stanford.ppl" artifactId="snaptree"/>
         <dependency groupId="org.mindrot" artifactId="jbcrypt"/>
         <dependency groupId="com.yammer.metrics" artifactId="metrics-core"/>
-        <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.2.1"/>
+        <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.0"/>
 
         <dependency groupId="log4j" artifactId="log4j"/>
         <!-- cassandra has a hard dependency on log4j, so force slf4j's log4j provider at runtime -->
diff --git a/lib/thrift-server-0.2.1.jar b/lib/thrift-server-0.3.0.jar
similarity index 74%
rename from lib/thrift-server-0.2.1.jar
rename to lib/thrift-server-0.3.0.jar
index 6b8de7d39f..3c93bb988f 100644
Binary files a/lib/thrift-server-0.2.1.jar and b/lib/thrift-server-0.3.0.jar differ
diff --git a/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java b/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java
index 57a7893e80..0df90ec583 100644
--- a/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java
+++ b/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java
@@ -84,7 +84,8 @@ public class THsHaDisruptorServer extends TDisruptorServer
                                                                                          .outputTransportFactory(args.outTransportFactory)
                                                                                          .inputProtocolFactory(protocolFactory)
                                                                                          .outputProtocolFactory(protocolFactory)
-                                                                                         .processor(args.processor);
+                                                                                         .processor(args.processor)
+                                                                                         .maxFrameSizeInBytes(DatabaseDescriptor.getThriftFramedTransportSize());
 
             return new THsHaDisruptorServer(serverArgs);
         }