diff --git a/ChangeLog b/ChangeLog
index b950579a1..837d21ca0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2003-07-04  Richard Frith-Macdonald <rfm@gnu.org>
 
-	* Source/NSPasteboard.m: Set protocols for proxy objects.
+	* Source/NSPasteboard.m: Add conditionally compiled code to
+	set protocols for proxy objects.  Let's use it when we have
+	no compilers which break on this.
 
 2003-07-03 01:43  Alexander Malmberg <alexander@malmberg.org>
 
diff --git a/Source/NSPasteboard.m b/Source/NSPasteboard.m
index 659a2f41b..1e82f0796 100644
--- a/Source/NSPasteboard.m
+++ b/Source/NSPasteboard.m
@@ -960,9 +960,11 @@ static  NSMapTable              *mimeMap = NULL;
       if (RETAIN((id)the_server) != nil)
 	{
 	  NSConnection	*conn = [(id)the_server connectionForProxy];
+#if 0	// When compilers work!
           Protocol      *p = @protocol(GSPasteboardSvr);
 
           [(id)the_server setProtocolForProxy: p];
+#endif
 	  [[NSNotificationCenter defaultCenter]
 	    addObserver: self
 	       selector: @selector(_lostServer:)
@@ -1113,12 +1115,14 @@ static  NSMapTable              *mimeMap = NULL;
 	{
 	  NSPasteboard	*ret;
 
+#if 0	// When compilers work
 	  if ([(id)anObj isProxy] == YES)
 	    {
 	      Protocol	*p = @protocol(GSPasteboardObj);
 
 	      [(id)anObj setProtocolForProxy: p];
 	    }
+#endif
 	  ret = [self _pasteboardWithTarget: anObj name: aName];
 	  NS_VALRETURN(ret);
 	}