diff --git a/lib/java/src/org/apache/thrift/transport/TFastFramedTransport.java b/lib/java/src/org/apache/thrift/transport/TFastFramedTransport.java
index 2a1f1da..e32b7db 100644
--- a/lib/java/src/org/apache/thrift/transport/TFastFramedTransport.java
+++ b/lib/java/src/org/apache/thrift/transport/TFastFramedTransport.java
@@ -59,9 +59,9 @@
    */
   public static final int DEFAULT_BUF_CAPACITY = 1024;
   /**
-   * How big is the largest allowable frame? Defaults to Integer.MAX_VALUE.
+   * How big is the largest allowable frame? Defaults to 16MB.
    */
-  public static final int DEFAULT_MAX_LENGTH = Integer.MAX_VALUE;
+  public static final int DEFAULT_MAX_LENGTH = 16384000;
 
   private final TTransport underlying;
   private final AutoExpandingBufferWriteTransport writeBuffer;
diff --git a/lib/java/src/org/apache/thrift/transport/TFramedTransport.java b/lib/java/src/org/apache/thrift/transport/TFramedTransport.java
index eb5b0c2..c948aa4 100644
--- a/lib/java/src/org/apache/thrift/transport/TFramedTransport.java
+++ b/lib/java/src/org/apache/thrift/transport/TFramedTransport.java
@@ -27,7 +27,7 @@
  */
 public class TFramedTransport extends TTransport {
 
-  protected static final int DEFAULT_MAX_LENGTH = 0x7FFFFFFF;
+  protected static final int DEFAULT_MAX_LENGTH = 16384000;
 
   private int maxLength_;