diff --git a/hermit/arch/x86/kernel/pci.c b/hermit/arch/x86/kernel/pci.c
index 8e99dca03..4a9a78624 100644
--- a/hermit/arch/x86/kernel/pci.c
+++ b/hermit/arch/x86/kernel/pci.c
@@ -32,7 +32,9 @@
 #include <asm/io.h>
 
 #include <asm/pci.h>
+#ifdef WITH_PCI_IDS
 #include "pcihdr.h"
+#endif
 
 /*
  * PCI configuration registers
@@ -182,6 +184,7 @@ int print_pci_adapters(void)
 					counter, adapters[bus][slot] & 0xffff, 
 					(adapters[bus][slot] & 0xffff0000) >> 16);
 
+#ifdef WITH_PCI_IDS
 				for (i=0; i<PCI_VENTABLE_LEN; i++) {
 					if ((adapters[bus][slot] & 0xffff) ==
 					    (uint32_t)PciVenTable[i].VenId)
@@ -201,6 +204,7 @@ int print_pci_adapters(void)
 						}
 					}
 				}
+#endif
 			}
 		}
 	}
diff --git a/hermit/include/hermit/config.h b/hermit/include/hermit/config.h
index 236b5d0ff..3676473e6 100644
--- a/hermit/include/hermit/config.h
+++ b/hermit/include/hermit/config.h
@@ -45,6 +45,7 @@ extern "C" {
 #define KMSG_SIZE		(8*1024)
 #define INT_SYSCALL		0x80
 #define MAILBOX_SIZE	32
+//#define WITH_PCI_IDS
 
 #define BYTE_ORDER		LITTLE_ENDIAN