diff --git a/src/etc/Makefile b/src/etc/Makefile
index 6b2a2a65..24221806 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.128 2001/06/26 18:00:18 brad Exp $
+#	$OpenBSD: Makefile,v 1.129 2001/07/04 06:34:18 mickey Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	US/Pacific
@@ -22,6 +22,11 @@ BIN1=	bootptab changelist ccd.conf csh.cshrc csh.login csh.logout \
 	shells syslog.conf weekly etc.${MACHINE}/disktab dhclient.conf \
 	mailer.conf
 
+.if (${MACHINE} == "alpha" || ${MACHINE} == "hppa" || \
+     ${MACHINE} == "i386" || ${MACHINE} == "powerpc")
+BIN1+=	wsconsctl.conf
+.endif
+
 # -rw-rw-r--
 BIN2=	motd
 
diff --git a/src/etc/rc b/src/etc/rc
index 39508df3..a7197a3e 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.177 2001/07/03 03:28:19 deraadt Exp $
+#	$OpenBSD: rc,v 1.178 2001/07/04 06:34:19 mickey Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -525,6 +525,17 @@ fi
 
 echo '.'
 
+if [ -f /etc/wsconsctl.conf ]; then
+(
+	# delete comments and blank lines
+	set -- `stripcom /etc/wsconsctl.conf`
+	while [ $# -ge 1 ] ; do
+		wsconsctl -w $1
+		shift
+	done
+)
+fi
+
 if [ -f /sbin/kbd -a -f /etc/kbdtype ]; then
 	kbd `cat /etc/kbdtype`
 fi
diff --git a/src/etc/wsconsctl.conf b/src/etc/wsconsctl.conf
new file mode 100644
index 00000000..5361bef6
--- /dev/null
+++ b/src/etc/wsconsctl.conf
@@ -0,0 +1,10 @@
+#	$OpenBSD: wsconsctl.conf,v 1.1 2001/07/04 06:34:19 mickey Exp $
+#
+# wscons configurable parameters
+#
+#keyboard.repeat.del1=200	# change keyboard repeat/delay
+#keyboard.repeat.deln=50
+#keyboard.encoding=ru		# use different keyboard encoding
+#display.vblank=on		# enable vertical sync blank for screen burner
+#display.screen_off=60000	# set screen burner timeout to 60 seconds
+#display.msact=off		# disable screen unburn w/ mouse