diff --git a/ChangeLog b/ChangeLog
index 03a9a84a0..9b12de4b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-12-15  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSMessagePort.m:
+	* Source/NSSocketPort.m:
+	Increase maximum supported message size from 10MB to 32MB in
+	recognition of the fact that everything is faster/bigger nowadays
+	and people might actually want to send single messages with
+	that much data in them.
+
 2005-12-13  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/Additions/GSXML.m: Fix error parsing date/time in xmlrpc
diff --git a/Source/NSMessagePort.m b/Source/NSMessagePort.m
index bbf51540b..94d4a1056 100644
--- a/Source/NSMessagePort.m
+++ b/Source/NSMessagePort.m
@@ -93,7 +93,7 @@
 /*
  * Largest chunk of data possible in DO
  */
-static gsu32	maxDataLength = 10 * 1024 * 1024;
+static gsu32	maxDataLength = 32 * 1024 * 1024;
 
 #if 0
 #define	M_LOCK(X) {NSDebugMLLog(@"NSMessagePort",@"lock %@",X); [X lock];}
diff --git a/Source/NSSocketPort.m b/Source/NSSocketPort.m
index e6b7ee32d..82f8067ff 100644
--- a/Source/NSSocketPort.m
+++ b/Source/NSSocketPort.m
@@ -105,7 +105,7 @@
 /*
  * Largest chunk of data possible in DO
  */
-static gsu32	maxDataLength = 10 * 1024 * 1024;
+static gsu32	maxDataLength = 32 * 1024 * 1024;
 
 #if 0
 #define	M_LOCK(X) {NSDebugMLLog(@"GSTcpHandleLock",@"lock %@ in %@",X,[NSThread currentThread]); [X lock];}