diff --git a/bochs/iodev/Makefile.in b/bochs/iodev/Makefile.in
index e4bc9925f..4f2f55333 100644
--- a/bochs/iodev/Makefile.in
+++ b/bochs/iodev/Makefile.in
@@ -62,6 +62,7 @@ BX_HW_IODEV_OBJS = \
   dma.o \
   floppy.o \
   harddrv.o \
+  @IODEBUG_OBJS@ \
   keyboard.o \
   parallel.o \
   serial.o \
diff --git a/bochs/iodev/devices.cc b/bochs/iodev/devices.cc
index f441c82c4..29ad84637 100644
--- a/bochs/iodev/devices.cc
+++ b/bochs/iodev/devices.cc
@@ -65,6 +65,9 @@ bx_devices_c::bx_devices_c(void)
   sb16 = NULL;
   ne2k = NULL;
   g2h = NULL;
+#if BX_IODEBUG_SUPPORT
+  iodebug = NULL;
+#endif
 
   num_read_handles = 0;
   num_write_handles = 0;
@@ -98,7 +101,7 @@ bx_devices_c::~bx_devices_c(void)
   void
 bx_devices_c::init(BX_MEM_C *newmem)
 {
-  BX_DEBUG(("Init $Id: devices.cc,v 1.15 2001-08-31 16:06:32 fries Exp $"));
+  BX_DEBUG(("Init $Id: devices.cc,v 1.16 2001-09-14 14:55:59 instinc Exp $"));
   mem = newmem;
   // Start with all IO port address registered to unmapped handler
   // MUST be called first
@@ -167,6 +170,11 @@ bx_devices_c::init(BX_MEM_C *newmem)
   keyboard = &bx_keyboard;
   keyboard->init(this, cmos);
 
+#if BX_IODEBUG_SUPPORT
+  iodebug = &bx_iodebug;
+  iodebug->init(this);
+#endif
+
   /*--- PARALLEL PORT ---*/
   parallel = &bx_parallel;
   parallel->init(this);
diff --git a/bochs/iodev/iodev.h b/bochs/iodev/iodev.h
index 37634063b..933dcffb5 100644
--- a/bochs/iodev/iodev.h
+++ b/bochs/iodev/iodev.h
@@ -50,6 +50,9 @@ class bx_pci_c;
 class bx_ioapic_c;
 class bx_ne2k_c;
 class bx_g2h_c;
+#if BX_IODEBUG_SUPPORT
+class bx_iodebug_c;
+#endif
 
 
 
@@ -104,6 +107,9 @@ public:
   bx_sb16_c        *sb16;
   bx_ne2k_c        *ne2k;
   bx_g2h_c         *g2h;
+#if BX_IODEBUG_SUPPORT
+  bx_iodebug_c	   *iodebug;
+#endif
 
 private:
   Bit8u                 read_handler_id[0x10000];  // 64K
@@ -149,6 +155,9 @@ private:
 #include "iodev/dma.h"
 #include "iodev/floppy.h"
 #include "iodev/harddrv.h"
+#if BX_IODEBUG_SUPPORT
+#   include "iodev/iodebug.h"
+#endif
 #include "iodev/keyboard.h"
 #include "iodev/parallel.h"
 #include "iodev/pic.h"