diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index de989a9106..56598da2b8 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-19	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* sapi/include/confdefs.h: Catch the error when the user lowers the
+	maximum number of drivers below the number of statically configured
+	ones.
+
 2007-12-19	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* sapi/src/extension.c, sapi/src/extensioncreate.c,
diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/sapi/include/confdefs.h
index 83a9dd35eb..146dd91ad2 100644
--- a/cpukit/sapi/include/confdefs.h
+++ b/cpukit/sapi/include/confdefs.h
@@ -407,6 +407,9 @@ rtems_driver_address_table Device_drivers[] = {
 #define CONFIGURE_MAXIMUM_DRIVERS CONFIGURE_NUMBER_OF_DRIVERS
 #endif
 
+#if (CONFIGURE_MAXIMUM_DRIVERS < CONFIGURE_NUMBER_OF_DRIVERS)
+  #error "not enough slots for static drivers"
+#endif
 /*
  *  Default the number of devices per device driver.  This value may be
  *  overridden by the user.