diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index c119eb2235..d53dbcc819 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,7 @@
 2007-03-28	Ralf Corsépius <ralf.corsepius@rtems.org>
 
+	* librpc/src/rpc/clnt_tcp.c (clnttcp_create): 
+	Use uintptr_t for "disrupt". Remove bogus (long) cast.
 	* libnetworking/net/ppp-comp.h: Remove (Unused).
 	* libnetworking/Makefile.am: Remove net/ppp-comp.h.
 	* libnetworking/sys/buf.h: Remove (Unused).
diff --git a/cpukit/librpc/src/rpc/clnt_tcp.c b/cpukit/librpc/src/rpc/clnt_tcp.c
index a6e80eda8b..79e82bd0ba 100644
--- a/cpukit/librpc/src/rpc/clnt_tcp.c
+++ b/cpukit/librpc/src/rpc/clnt_tcp.c
@@ -123,10 +123,10 @@ clnttcp_create(raddr, prog, vers, sockp, sendsz, recvsz)
 	register struct ct_data *ct = NULL;
 	struct timeval now;
 	struct rpc_msg call_msg;
-	static u_int32_t disrupt;
+	static uintptr_t disrupt;
 
 	if (disrupt == 0)
-		disrupt = (u_int32_t)(long)raddr;
+		disrupt = (uintptr_t)raddr;
 
 	h  = (CLIENT *)mem_alloc(sizeof(*h));
 	if (h == NULL) {