diff --git a/ChangeLog b/ChangeLog
index c877870ef..c1165df84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-12-31  Richard Frith-Macdonald <rfm@gnu.org>
+
+        * Source/NSMessagePort.m:
+	* Source/NSSocketPort.m:
+	Fix error sending NSPortMessage objects which have not
+	reserved space in their first component.
+
 2007-12-29  Adam Fedor  <fedor@gnu.org>
 
 	* Version 1.14.2
diff --git a/Source/NSMessagePort.m b/Source/NSMessagePort.m
index f809fadc8..4d5159fff 100644
--- a/Source/NSMessagePort.m
+++ b/Source/NSMessagePort.m
@@ -1843,6 +1843,7 @@ typedef	struct {
        * a maximum of NETBLOCK bytes.  This is to try to get a single,
        * efficient write operation if possible.
        */
+      c = [components count];
       for (i = 1; i < c; i++)
 	{
 	  id	o = [components objectAtIndex: i];
diff --git a/Source/NSSocketPort.m b/Source/NSSocketPort.m
index 95efa2642..7d58a8df5 100644
--- a/Source/NSSocketPort.m
+++ b/Source/NSSocketPort.m
@@ -2384,6 +2384,7 @@ static Class		tcpPortClass;
        * a maximum of NETBLOCK bytes.  This is to try to get a single,
        * efficient write operation if possible.
        */
+      c = [components count];
       for (i = 1; i < c; i++)
 	{
 	  id	o = [components objectAtIndex: i];