diff --git a/src/arch/i386/prefix/romprefix.S b/src/arch/i386/prefix/romprefix.S
index dd602ddb..421aa027 100644
--- a/src/arch/i386/prefix/romprefix.S
+++ b/src/arch/i386/prefix/romprefix.S
@@ -286,6 +286,7 @@ pnp_scan:
 	call	print_message
 	jmp	pnp_done
 no_pnp:	/* Not PnP-compliant - hook INT 19 */
+#ifdef NONPNP_HOOK_INT19
 	movw	$init_message_int19, %si
 	xorw	%di, %di
 	call	print_message
@@ -296,6 +297,7 @@ no_pnp:	/* Not PnP-compliant - hook INT 19 */
 	pushw	%gs /* %gs contains runtime %cs */
 	pushw	$int19_entry
 	popl	%es:( 0x19 * 4 )
+#endif /* NONPNP_HOOK_INT19 */
 pnp_done:
 
 	/* Check for PMM */
diff --git a/src/config/general.h b/src/config/general.h
index 9eb88651..7ae1f75b 100644
--- a/src/config/general.h
+++ b/src/config/general.h
@@ -127,6 +127,12 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #undef	PXE_CMD			/* PXE commands */
 #undef	REBOOT_CMD		/* Reboot command */
 
+/*
+ * ROM-specific options
+ *
+ */
+#undef	NONPNP_HOOK_INT19	/* Hook INT19 on non-PnP BIOSes */
+
 /*
  * Error message tables to include
  *