diff --git a/framework/src/play/server/PlayHandler.java b/framework/src/play/server/PlayHandler.java
index e6d1a5c76e..9e01e5b22b 100644
--- a/framework/src/play/server/PlayHandler.java
+++ b/framework/src/play/server/PlayHandler.java
@@ -729,7 +729,7 @@ public void exceptionCaught(ChannelHandlerContext ctx, ExceptionEvent e) throws
             // Log this, we can't call serve500()
             Throwable t = e.getCause();
             if (t instanceof TooLongFrameException) {
-                Logger.error(t, "Request exceeds 8192 bytes");
+                Logger.error(t, "Request exceeds 16384 bytes");
             }
             e.getChannel().close();
         } catch (Exception ex) {
diff --git a/framework/src/play/server/PlayHttpRequestDecoder.java b/framework/src/play/server/PlayHttpRequestDecoder.java
index 9f0a755822..be91268405 100644
--- a/framework/src/play/server/PlayHttpRequestDecoder.java
+++ b/framework/src/play/server/PlayHttpRequestDecoder.java
@@ -5,6 +5,6 @@
 public class PlayHttpRequestDecoder extends HttpRequestDecoder {
 
     public PlayHttpRequestDecoder() {
-        super(8192, 8192, 8192);
+        super(16384, 16384, 16384);
     }
 }