diff --git a/ChangeLog b/ChangeLog
index f0a7a7f98..296316646 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-13  Andrew Ruder <aeruder@ksu.edu>
+
+	* Source/NSMessagePort.m, Source/NSSocketPort.m: Use memmove instead
+	of memcpy for potentially overlapping moves.
+
 2004-07-10 Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Tools/cvtenc.m: Use uppercase 'U' rather than 'u' in unicode
@@ -15,9 +20,9 @@
 
 2004-07-05 Richard Frith-Macdonald <rfm@gnu.org>
 
-	* Source/Unicode.m: GSToUnicode() be strict about converting ASCII
-	to unicode.  
-	GetDefEncoding() don't override default (latin1) encoding to be
+	* Source/Additions/Unicode.m: GSToUnicode() be strict about
+	converting ASCII to unicode.
+	(GetDefEncoding): Don't override default (latin1) encoding to be
 	ascii if we only have the return value of nl_langinfo() to go on.
 
 2004-07-04 Richard Frith-Macdonald <rfm@gnu.org>
diff --git a/Source/NSMessagePort.m b/Source/NSMessagePort.m
index 144c07a1a..e827774f9 100644
--- a/Source/NSMessagePort.m
+++ b/Source/NSMessagePort.m
@@ -693,7 +693,7 @@ static Class	runLoopClass;
 			  rLength -= rWant;
 			  if (rLength > 0)
 			    {
-			      memcpy(bytes, bytes + rWant, rLength);
+			      memmove(bytes, bytes + rWant, rLength);
 			    }
 			  rWant = sizeof(GSPortItemHeader);
 			  d = [mutableDataClass new];
@@ -722,7 +722,7 @@ static Class	runLoopClass;
 			  rLength -= rWant;
 			  if (rLength > 0)
 			    {
-			      memcpy(bytes, bytes + rWant, rLength);
+			      memmove(bytes, bytes + rWant, rLength);
 			    }
 			  rWant = l;
 			}
@@ -745,7 +745,7 @@ static Class	runLoopClass;
 		      rLength -= rWant;
 		      if (rLength > 0)
 			{
-			  memcpy(bytes, bytes + rWant, rLength);
+			  memmove(bytes, bytes + rWant, rLength);
 			}
 		      rWant = l;
 		    }
@@ -793,7 +793,7 @@ static Class	runLoopClass;
 		      rLength -= rWant;
 		      if (rLength > 0)
 			{
-			  memcpy(bytes, bytes + rWant, rLength);
+			  memmove(bytes, bytes + rWant, rLength);
 			}
 		      rWant = sizeof(GSPortItemHeader);
 		      if (nItems == 1)
@@ -809,7 +809,7 @@ static Class	runLoopClass;
 		      rLength -= rWant;
 		      if (rLength > 0)
 			{
-			  memcpy(bytes, bytes + rWant, rLength);
+			  memmove(bytes, bytes + rWant, rLength);
 			}
 		      rWant = sizeof(GSPortItemHeader);
 		    }
@@ -828,7 +828,7 @@ static Class	runLoopClass;
 		  rLength -= rWant;
 		  if (rLength > 0)
 		    {
-		      memcpy(bytes, bytes + rWant, rLength);
+		      memmove(bytes, bytes + rWant, rLength);
 		    }
 		  rWant = sizeof(GSPortItemHeader);
 		  if (nItems == [rItems count])
@@ -857,7 +857,7 @@ static Class	runLoopClass;
 		  rLength -= rWant;
 		  if (rLength > 0)
 		    {
-		      memcpy(bytes, bytes + rWant, rLength);
+		      memmove(bytes, bytes + rWant, rLength);
 		    }
 		  rWant = sizeof(GSPortItemHeader);
 
diff --git a/Source/NSSocketPort.m b/Source/NSSocketPort.m
index 92c920703..15a113811 100644
--- a/Source/NSSocketPort.m
+++ b/Source/NSSocketPort.m
@@ -806,7 +806,7 @@ static Class	runLoopClass;
 			  rLength -= rWant;
 			  if (rLength > 0)
 			    {
-			      memcpy(bytes, bytes + rWant, rLength);
+			      memmove(bytes, bytes + rWant, rLength);
 			    }
 			  rWant = sizeof(GSPortItemHeader);
 			  d = [mutableDataClass new];
@@ -835,7 +835,7 @@ static Class	runLoopClass;
 			  rLength -= rWant;
 			  if (rLength > 0)
 			    {
-			      memcpy(bytes, bytes + rWant, rLength);
+			      memmove(bytes, bytes + rWant, rLength);
 			    }
 			  rWant = l;
 			}
@@ -858,7 +858,7 @@ static Class	runLoopClass;
 		      rLength -= rWant;
 		      if (rLength > 0)
 			{
-			  memcpy(bytes, bytes + rWant, rLength);
+			  memmove(bytes, bytes + rWant, rLength);
 			}
 		      rWant = l;
 		    }
@@ -906,7 +906,7 @@ static Class	runLoopClass;
 		      rLength -= rWant;
 		      if (rLength > 0)
 			{
-			  memcpy(bytes, bytes + rWant, rLength);
+			  memmove(bytes, bytes + rWant, rLength);
 			}
 		      rWant = sizeof(GSPortItemHeader);
 		      if (nItems == 1)
@@ -922,7 +922,7 @@ static Class	runLoopClass;
 		      rLength -= rWant;
 		      if (rLength > 0)
 			{
-			  memcpy(bytes, bytes + rWant, rLength);
+			  memmove(bytes, bytes + rWant, rLength);
 			}
 		      rWant = sizeof(GSPortItemHeader);
 		    }
@@ -941,7 +941,7 @@ static Class	runLoopClass;
 		  rLength -= rWant;
 		  if (rLength > 0)
 		    {
-		      memcpy(bytes, bytes + rWant, rLength);
+		      memmove(bytes, bytes + rWant, rLength);
 		    }
 		  rWant = sizeof(GSPortItemHeader);
 		  if (nItems == [rItems count])
@@ -970,7 +970,7 @@ static Class	runLoopClass;
 		  rLength -= rWant;
 		  if (rLength > 0)
 		    {
-		      memcpy(bytes, bytes + rWant, rLength);
+		      memmove(bytes, bytes + rWant, rLength);
 		    }
 		  rWant = sizeof(GSPortItemHeader);