diff --git a/sys/i386/boot/Makefile b/sys/i386/boot/Makefile
index 4809d9c3cd24..d01d81cf8153 100644
--- a/sys/i386/boot/Makefile
+++ b/sys/i386/boot/Makefile
@@ -20,7 +20,7 @@
 # the rights to redistribute these changes.
 #
 #	from: Mach, Revision 2.2	92/04/04  11:33:46  rpd
-#	$Id: Makefile,v 1.6 1994/05/30 05:23:46 ache Exp $
+#	$Id: Makefile,v 1.7 1994/06/02 16:50:56 jkh Exp $
 #
 
 wd0:
@@ -32,7 +32,10 @@ wd0:
 NOPROG=	noprog
 NOMAN=	noman
 
-CFLAGS  = -O2 -DDO_BAD144 -I${.CURDIR}
+# tunable loopcount parameter, waiting for keypress
+BOOTWAIT=240000
+
+CFLAGS  = -O2 -DDO_BAD144 -DBOOTWAIT=${BOOTWAIT} -I${.CURDIR}
 LIBS= -lc
 INC= -I${.CURDIR}/../..
 
diff --git a/sys/i386/boot/biosboot/Makefile b/sys/i386/boot/biosboot/Makefile
index 4809d9c3cd24..d01d81cf8153 100644
--- a/sys/i386/boot/biosboot/Makefile
+++ b/sys/i386/boot/biosboot/Makefile
@@ -20,7 +20,7 @@
 # the rights to redistribute these changes.
 #
 #	from: Mach, Revision 2.2	92/04/04  11:33:46  rpd
-#	$Id: Makefile,v 1.6 1994/05/30 05:23:46 ache Exp $
+#	$Id: Makefile,v 1.7 1994/06/02 16:50:56 jkh Exp $
 #
 
 wd0:
@@ -32,7 +32,10 @@ wd0:
 NOPROG=	noprog
 NOMAN=	noman
 
-CFLAGS  = -O2 -DDO_BAD144 -I${.CURDIR}
+# tunable loopcount parameter, waiting for keypress
+BOOTWAIT=240000
+
+CFLAGS  = -O2 -DDO_BAD144 -DBOOTWAIT=${BOOTWAIT} -I${.CURDIR}
 LIBS= -lc
 INC= -I${.CURDIR}/../..
 
diff --git a/sys/i386/boot/biosboot/io.c b/sys/i386/boot/biosboot/io.c
index 6a5a58a3e3be..736a3480f9a7 100644
--- a/sys/i386/boot/biosboot/io.c
+++ b/sys/i386/boot/biosboot/io.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:57  rpd
- *	$Id$
+ *	$Id: io.c,v 1.3 1993/10/16 19:11:36 rgrimes Exp $
  */
 
 #include <i386/include/pio.h>
@@ -143,7 +143,9 @@ char *buf;
 	int	i;
 	char *ptr=buf;
 
-	for (i = 240000; i>0; i--)
+#if BOOTWAIT
+	for (i = BOOTWAIT; i>0; i--)
+#endif
 		if (ischar())
 			for (;;)
 				switch(*ptr = getchar() & 0xff) {
diff --git a/sys/i386/boot/io.c b/sys/i386/boot/io.c
index 6a5a58a3e3be..736a3480f9a7 100644
--- a/sys/i386/boot/io.c
+++ b/sys/i386/boot/io.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:57  rpd
- *	$Id$
+ *	$Id: io.c,v 1.3 1993/10/16 19:11:36 rgrimes Exp $
  */
 
 #include <i386/include/pio.h>
@@ -143,7 +143,9 @@ char *buf;
 	int	i;
 	char *ptr=buf;
 
-	for (i = 240000; i>0; i--)
+#if BOOTWAIT
+	for (i = BOOTWAIT; i>0; i--)
+#endif
 		if (ischar())
 			for (;;)
 				switch(*ptr = getchar() & 0xff) {