diff --git a/cpukit/include/rtems/confdefs/iodrivers.h b/cpukit/include/rtems/confdefs/iodrivers.h
index db5dab23a3..b2068b4a19 100644
--- a/cpukit/include/rtems/confdefs/iodrivers.h
+++ b/cpukit/include/rtems/confdefs/iodrivers.h
@@ -50,17 +50,18 @@
 #define _CONFIGURE_BSP_PREREQUISITE_DRIVERS CONFIGURE_BSP_PREREQUISITE_DRIVERS
 #endif
 
-#if defined( _CONFIGURE_BSP_PREREQUISITE_DRIVERS ) ||           \
-  defined( CONFIGURE_APPLICATION_PREREQUISITE_DRIVERS ) ||      \
-  defined( CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER ) ||      \
-  defined( CONFIGURE_APPLICATION_NEEDS_RTC_DRIVER ) ||          \
-  defined( CONFIGURE_APPLICATION_NEEDS_WATCHDOG_DRIVER ) ||     \
-  defined( CONFIGURE_APPLICATION_NEEDS_STUB_DRIVER ) ||         \
-  defined( CONFIGURE_APPLICATION_NEEDS_ZERO_DRIVER ) ||         \
-  defined( CONFIGURE_APPLICATION_NEEDS_IDE_DRIVER ) ||          \
-  defined( CONFIGURE_APPLICATION_NEEDS_ATA_DRIVER ) ||          \
-  defined( CONFIGURE_APPLICATION_NEEDS_FRAME_BUFFER_DRIVER ) || \
-  defined( CONFIGURE_APPLICATION_EXTRA_DRIVERS )
+#if defined(_CONFIGURE_BSP_PREREQUISITE_DRIVERS) || \
+  defined(CONFIGURE_APPLICATION_PREREQUISITE_DRIVERS) || \
+  defined(CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER) || \
+  defined(CONFIGURE_APPLICATION_NEEDS_RTC_DRIVER) || \
+  defined(CONFIGURE_APPLICATION_NEEDS_WATCHDOG_DRIVER) || \
+  defined(CONFIGURE_APPLICATION_NEEDS_STUB_DRIVER) || \
+  defined(CONFIGURE_APPLICATION_NEEDS_ZERO_DRIVER) || \
+  defined(CONFIGURE_APPLICATION_NEEDS_IDE_DRIVER) || \
+  defined(CONFIGURE_APPLICATION_NEEDS_ATA_DRIVER) || \
+  defined(CONFIGURE_APPLICATION_NEEDS_FRAME_BUFFER_DRIVER) || \
+  defined(CONFIGURE_APPLICATION_NEEDS_LIBI2C_DRIVER) || \
+  defined(CONFIGURE_APPLICATION_EXTRA_DRIVERS)
 #define _CONFIGURE_HAS_IO_DRIVERS
 #endif
 
@@ -113,6 +114,10 @@
   #include <libchip/ata.h>
 #endif
 
+#ifdef CONFIGURE_APPLICATION_NEEDS_LIBI2C_DRIVER
+  #include <rtems/libi2c.h>
+#endif
+
 #ifndef CONFIGURE_MAXIMUM_DRIVERS
   #define CONFIGURE_MAXIMUM_DRIVERS
 #endif
@@ -158,8 +163,11 @@ rtems_driver_address_table
   #ifdef CONFIGURE_APPLICATION_EXTRA_DRIVERS
     CONFIGURE_APPLICATION_EXTRA_DRIVERS,
   #endif
-  #if defined( CONFIGURE_APPLICATION_NEEDS_NULL_DRIVER ) || \
-    !defined( _CONFIGURE_HAS_IO_DRIVERS )
+  #ifdef CONFIGURE_APPLICATION_NEEDS_LIBI2C_DRIVER
+    RTEMS_LIBI2C_DRIVER_TABLE_ENTRY,
+  #endif
+  #if defined(CONFIGURE_APPLICATION_NEEDS_NULL_DRIVER) || \
+    !defined(_CONFIGURE_HAS_IO_DRIVERS)
     NULL_DRIVER_TABLE_ENTRY
   #endif
 };