diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index ca154f1e9f..1666873784 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-18	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* rtems/include/rtems/rtems/object.h,
+	rtems/src/rtemsobjectidapimaximum.c:
+	Let rtems_object_id_api_maximum() return OBJECTS_APIS_LAST.
+
 2010-06-18	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* libnetworking/rtems/mkrootfs.h: doxygen cosmetics.
diff --git a/cpukit/rtems/include/rtems/rtems/object.h b/cpukit/rtems/include/rtems/rtems/object.h
index 2d473b33d3..72d65c6562 100644
--- a/cpukit/rtems/include/rtems/rtems/object.h
+++ b/cpukit/rtems/include/rtems/rtems/object.h
@@ -240,7 +240,7 @@ rtems_status_code rtems_object_set_name(
  *  @note A body is also provided.
  */
 #define rtems_object_id_api_maximum() \
-  OBJECTS_ITRON_API
+  OBJECTS_APIS_LAST
 
 /**
  *  @brief Get Lowest Valid Class Value
diff --git a/cpukit/rtems/src/rtemsobjectidapimaximum.c b/cpukit/rtems/src/rtemsobjectidapimaximum.c
index bfc00d4cd5..fbf6c19d02 100644
--- a/cpukit/rtems/src/rtemsobjectidapimaximum.c
+++ b/cpukit/rtems/src/rtemsobjectidapimaximum.c
@@ -22,5 +22,5 @@
 #undef rtems_object_id_api_maximum
 int rtems_object_id_api_maximum(void)
 {
-  return OBJECTS_ITRON_API;
+  return OBJECTS_APIS_LAST;
 }