diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index d091fd97f4..c4ab38b445 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-29	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* rtems/include/rtems/rtems/tasks.h: Change rtems_task_argument to
+	  uintptr_t.
+
 2007-03-29	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* libnetworking/netinet/ip_icmp.c, libnetworking/netinet/ip_input.c,
diff --git a/cpukit/rtems/include/rtems/rtems/tasks.h b/cpukit/rtems/include/rtems/rtems/tasks.h
index 03091ed6ab..bc59c14921 100644
--- a/cpukit/rtems/include/rtems/rtems/tasks.h
+++ b/cpukit/rtems/include/rtems/rtems/tasks.h
@@ -121,7 +121,7 @@ typedef void rtems_task;
  *  The following defines the argument to an RTEMS task.
  */
 
-typedef uint32_t   rtems_task_argument;
+typedef uintptr_t   rtems_task_argument;
 
 /*
  *  The following defines the type for the entry point of an RTEMS task.