diff --git a/bochs/iodev/pci.cc b/bochs/iodev/pci.cc
index 7ee886806..7aa32e54e 100644
--- a/bochs/iodev/pci.cc
+++ b/bochs/iodev/pci.cc
@@ -387,7 +387,7 @@ void bx_pci_bridge_c::smram_control(Bit8u value8)
 #if BX_DEBUGGER
 void bx_pci_bridge_c::debug_dump(int argc, char **argv)
 {
-  int arg, i;
+  int arg, i, j, r;
 
   dbg_printf("i440FX PMC/DBX\n\n");
   dbg_printf("confAddr = 0x%08x\n", BX_PCI_THIS confAddr);
@@ -403,9 +403,14 @@ void bx_pci_bridge_c::debug_dump(int argc, char **argv)
   } else {
     for (arg = 0; arg < argc; arg++) {
       if (!strcmp(argv[arg], "dump=full")) {
-        dbg_printf("\nPCI config space (reg = value)\n");
-        for (i=0; i<256; i++) {
-          dbg_printf("0x%02x = 0x%02x\n", i, BX_PCI_THIS pci_conf[i]);
+        dbg_printf("\nPCI config space\n\n");
+        r = 0;
+        for (i=0; i<16; i++) {
+          dbg_printf("%04x ", r);
+          for (j=0; j<16; j++) {
+            dbg_printf(" %02x", BX_PCI_THIS pci_conf[r++]);
+          }
+          dbg_printf("\n");
         }
       } else {
         dbg_printf("\nUnknown option: '%s'\n", argv[arg]);
diff --git a/bochs/iodev/pci2isa.cc b/bochs/iodev/pci2isa.cc
index df24c5988..bd8222065 100644
--- a/bochs/iodev/pci2isa.cc
+++ b/bochs/iodev/pci2isa.cc
@@ -385,7 +385,7 @@ void bx_piix3_c::pci_write_handler(Bit8u address, Bit32u value, unsigned io_len)
 #if BX_DEBUGGER
 void bx_piix3_c::debug_dump(int argc, char **argv)
 {
-  int arg, i;
+  int arg, i, j, r;
 
   dbg_printf("PIIX3 ISA bridge\n\n");
   dbg_printf("ELCR1 = 0x%02x\n", BX_P2I_THIS s.elcr1);
@@ -405,9 +405,14 @@ void bx_piix3_c::debug_dump(int argc, char **argv)
   } else {
     for (arg = 0; arg < argc; arg++) {
       if (!strcmp(argv[arg], "dump=full")) {
-        dbg_printf("\nPCI config space (reg = value)\n");
-        for (i=0; i<256; i++) {
-          dbg_printf("0x%02x = 0x%02x\n", i, BX_P2I_THIS pci_conf[i]);
+        dbg_printf("\nPCI config space\n\n");
+        r = 0;
+        for (i=0; i<16; i++) {
+          dbg_printf("%04x ", r);
+          for (j=0; j<16; j++) {
+            dbg_printf(" %02x", BX_P2I_THIS pci_conf[r++]);
+          }
+          dbg_printf("\n");
         }
       } else {
         dbg_printf("\nUnknown option: '%s'\n", argv[arg]);