diff --git a/etc/rc b/etc/rc
index 24fcb1b4e2d7..b7b78eff7608 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$Id: rc,v 1.48 1995/03/21 15:20:47 jkh Exp $
+#	$Id: rc,v 1.49 1995/03/21 16:44:03 wollman Exp $
 #	From: @(#)rc	5.27 (Berkeley) 6/5/91
 
 # System startup script run by init on autoboot
@@ -266,18 +266,76 @@ if [ -x /sbin/ldconfig ]; then
 	ldconfig ${_LDC}
 fi
 
-# Syscons screen saver
-if [ "X${saver}" != X"NO" ] ; then
-	echo -n "syscons screensaver: "
-	modload -u -o /tmp/saver_mod -e saver_init -q /lkm/${saver}_saver_mod.o
+######################### Start Of Syscons Section #######################
+
+kbdadjust=NO
+[ "X${keymap}" != X"NO" -o "X${keyrate}" != X"NO" ] && kbdadjust=YES
+vidadjust=NO
+[ "X${scrnmap}" != X"NO" -o "X${font8x16}" != X"NO" -o \
+	"X${font8x14}" != X"NO" -o "X${font8x8}" != X"NO" -o \
+	"X${blanktime}" != X"NO" ] && vidadjust=YES
+
+[ "X${kbdajust}" != X"NO" -o "X${vidajust}" != X"NO" -o \
+	"X${saver}" != X"NO" ] && echo "starting syscons:"
+
+[ "X${kbdajust}" != X"NO" ] && echo "kbdcontrol: "
+
+# keymap
+if [ "X${keymap}" != X"NO" ]; then
+	echo -n "keymap "
+	kbdcontrol -l ${keymap}
 fi
 
-# Syscons keymap
-if [ "X${keymap}" != X"NO" ]; then
-	echo -n "syscons keymap: "
-	kbdcontrol -l ${KEYMAP}
+# keyrate
+if [ "X${keyrate}" != X"NO" ]; then
+	echo -n "keyrate "
+	kbdcontrol -r ${keyrate}
 fi
 
+[ "X${kbdajust}" != X"NO" ] && echo
+[ "X${vidajust}" != X"NO" ] && echo "vidcontrol: "
+
+# screen mapping
+if [ "X${scrnmap}" != X"NO" ]; then
+	echo -n "screen_map "
+	vidcontrol -l ${scrnmap}
+fi
+
+# font 8x16
+if [ "X${font8x16}" != X"NO" ]; then
+	echo -n "font8x16 "
+	vidcontrol -f 8x16 ${font8x16}
+fi
+
+# font 8x14
+if [ "X${font8x14}" != X"NO" ]; then
+	echo -n "font8x14 "
+	vidcontrol -f 8x14 ${font8x14}
+fi
+
+# font 8x8
+if [ "X${font8x8}" != X"NO" ]; then
+	echo -n "font8x8 "
+	vidcontrol -f 8x8 ${font8x8}
+fi
+
+# blank time
+if [ "X${blanktime}" != X"NO" ]; then
+	echo -n "blank_time "
+	vidcontrol -t ${blanktime}
+fi
+
+[ "X${vidajust}" != X"NO" ] && echo
+
+# screen saver
+if [ "X${saver}" != X"NO" ] ; then
+	echo -n "screensaver: "
+	modstat | grep _saver || modload -u -o /tmp/saver_mod -e \
+				 saver_init -q /lkm/${saver}_saver_mod.o
+fi
+
+######################### End Of Syscons Section #######################
+
 . /etc/rc.local
 
 date
diff --git a/etc/sysconfig b/etc/sysconfig
index e04a24754fbd..ac847cb6d724 100644
--- a/etc/sysconfig
+++ b/etc/sysconfig
@@ -4,13 +4,47 @@
 # This is sysconfig - a file full of useful variables that you can set 
 # to change the default startup behavior of your system.
 #
-#	$Id: sysconfig,v 1.1 1995/03/21 15:20:48 jkh Exp $
+#	$Id: sysconfig,v 1.2 1995/03/21 16:44:04 wollman Exp $
 
-# Set to screen saver desired:  blank, green, snake, star (or NO for none)
+######################### Start Of Syscons Section #######################
+
+# Choose keyboard map from /usr/share/syscons/keymaps/* or NO if default.
+keymap=NO
+
+# Set keyboard rate to: slow, normal, fast or NO if default.
+keyrate=NO
+
+# Choose screen map from /usr/share/syscons/scrnmaps/* (or NO for none)
+scrnmap=NO
+
+# Choose font 8x16 from /usr/share/syscons/fonts/* (or NO for default)
+font8x16=NO
+
+# Choose font 8x14 from /usr/share/syscons/fonts/* (or NO for default)
+font8x14=NO
+
+# Choose font 8x8 from /usr/share/syscons/fonts/* (or NO for default)
+font8x8=NO
+
+# Set blank time (in seconds) or "off" to turn it off (or NO for default)
+blanktime=NO
+
+# Set to screen saver desired: blank, green, snake, star (or NO for none)
 saver=NO
 
-# Set to alternate default keyboard map file or NO if none.
-keymap=NO
+# General russian setup for example:
+# (koi8-r keyboard with cp866 screen font mapped to koi8-r)
+#
+# keymap=ru.koi8-r
+# keyrate=fast
+# scrnmap=koi8-r2cp866
+# font8x16=cp866b-8x16
+# font8x14=cp866-8x14
+# font8x8=cp866-8x8
+# blanktime=600
+# saver=snake
+
+######################### End Of Syscons Section #######################
 
 # Set to the host you'd like set as your default router, or NO of none.
 defaultrouter=NO