diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 36f875cfd0..d0340e843e 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-29	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* rtems/src/rtemsobjectgetapiclassname.c: Class name strings are not
+	available when API is disabled. Do not attempt to use them.
+
 2008-01-29	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* score/include/rtems/system.h: First cut at Doxygen mainpage.
diff --git a/cpukit/rtems/src/rtemsobjectgetapiclassname.c b/cpukit/rtems/src/rtemsobjectgetapiclassname.c
index 00277f1c23..9455a9aece 100644
--- a/cpukit/rtems/src/rtemsobjectgetapiclassname.c
+++ b/cpukit/rtems/src/rtemsobjectgetapiclassname.c
@@ -84,12 +84,16 @@ const char *rtems_object_get_api_class_name(
     case OBJECTS_CLASSIC_API:
       api_assoc = rtems_object_api_classic_assoc;
       break;
+#ifdef RTEMS_POSIX_API
     case OBJECTS_POSIX_API:
       api_assoc = rtems_object_api_posix_assoc;
       break;
+#endif
+#ifdef RTEMS_ITRON_API
     case OBJECTS_ITRON_API:
       api_assoc = rtems_object_api_itron_assoc;
       break;
+#endif
     default:
       return "BAD API";
   }