diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 60ba0316c8..902bd4a13a 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-29	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* librpc/src/rpc/pmap_rmt.c: Use uintptr_t for better 16bit
+	compliance.
+
 2010-04-29	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* aclocal/enable-itron.m4: Cosmetics.
diff --git a/cpukit/librpc/src/rpc/pmap_rmt.c b/cpukit/librpc/src/rpc/pmap_rmt.c
index 59c7ddd8d2..1ab72b2f15 100644
--- a/cpukit/librpc/src/rpc/pmap_rmt.c
+++ b/cpukit/librpc/src/rpc/pmap_rmt.c
@@ -281,10 +281,10 @@ clnt_broadcast(
 	struct rpc_msg msg;
 	struct timeval t, tv;
 	char outbuf[MAX_BROADCAST_SIZE], inbuf[UDPMSGSIZE];
-	static u_int32_t disrupt;
+	static uintptr_t disrupt;
 
 	if (disrupt == 0)
-		disrupt = (u_int32_t)(long)resultsp;
+		disrupt = (uintptr_t) resultsp;
 
 	/*
 	 * initialization: create a socket, a broadcast address, and