diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 3126433924..a9b5701697 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-12	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* score/include/rtems/system.h: Let RTEMS_offsetof return uintptr_t
+	instead of uint32_t (16bit target compatibility).
+
 2010-04-12	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* libmisc/monitor/mon-part.c, libmisc/monitor/mon-region.c:
diff --git a/cpukit/score/include/rtems/system.h b/cpukit/score/include/rtems/system.h
index 0993f1e632..9243e32305 100644
--- a/cpukit/score/include/rtems/system.h
+++ b/cpukit/score/include/rtems/system.h
@@ -189,7 +189,7 @@ typedef void * proc_ptr;
  *  This macro is used to obtain the offset of a field in a structure.
  */
 #define RTEMS_offsetof(type, field) \
-       ((uint32_t) &(((type *) 0)->field))
+       ((uintptr_t) &(((type *) 0)->field))
 
 /**
  *  The following is the extern for the RTEMS version string.