diff --git a/ChangeLog b/ChangeLog
index 81362aed7..b950579a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-04  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSPasteboard.m: Set protocols for proxy objects.
+
 2003-07-03 01:43  Alexander Malmberg <alexander@malmberg.org>
 
 	* Source/NSFont.m (getNSFont): Only update the cache when the font
diff --git a/Source/NSPasteboard.m b/Source/NSPasteboard.m
index a1404b539..659a2f41b 100644
--- a/Source/NSPasteboard.m
+++ b/Source/NSPasteboard.m
@@ -959,8 +959,10 @@ static  NSMapTable              *mimeMap = NULL;
 
       if (RETAIN((id)the_server) != nil)
 	{
-	  NSConnection*	conn = [(id)the_server connectionForProxy];
+	  NSConnection	*conn = [(id)the_server connectionForProxy];
+          Protocol      *p = @protocol(GSPasteboardSvr);
 
+          [(id)the_server setProtocolForProxy: p];
 	  [[NSNotificationCenter defaultCenter]
 	    addObserver: self
 	       selector: @selector(_lostServer:)
@@ -1107,10 +1109,16 @@ static  NSMapTable              *mimeMap = NULL;
       id<GSPasteboardObj>	anObj;
 
       anObj = [[self _pbs] pasteboardWithName: aName];
-      if (anObj)
+      if (anObj != nil)
 	{
 	  NSPasteboard	*ret;
 
+	  if ([(id)anObj isProxy] == YES)
+	    {
+	      Protocol	*p = @protocol(GSPasteboardObj);
+
+	      [(id)anObj setProtocolForProxy: p];
+	    }
 	  ret = [self _pasteboardWithTarget: anObj name: aName];
 	  NS_VALRETURN(ret);
 	}