diff --git a/etc/rc b/etc/rc
index 40f7130a76cf..a52a7e4710a6 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$Id: rc,v 1.153 1998/09/07 17:18:36 cracauer Exp $
+#	$Id: rc,v 1.154 1998/09/09 22:27:21 jraynard Exp $
 #	From: @(#)rc	5.27 (Berkeley) 6/5/91
 
 # System startup script run by init on autoboot
@@ -338,6 +338,9 @@ if [ "X${local_startup}" != X"NO" ]; then
 	echo .
 fi
 
+# Run rc.devfs if present to customify devfs
+[ -f /etc/rc.devfs ] && sh /etc/rc.devfs
+
 # Do traditional (but rather obsolete) rc.local file if it exists.
 [ -f /etc/rc.local ] && sh /etc/rc.local
 
diff --git a/etc/rc.devfs b/etc/rc.devfs
new file mode 100644
index 000000000000..d0d5279d903d
--- /dev/null
+++ b/etc/rc.devfs
@@ -0,0 +1,14 @@
+#
+# $Id$
+#
+# If there is a global system configuration file, suck it in.
+if [ -f /etc/rc.conf ]; then
+	. /etc/rc.conf
+fi
+
+# Setup DEVFS, ie permisisons, links etc.
+
+echo -n 'Setting up DEVFS: '
+ln -fs ttyv0 vga
+
+echo '.'
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index d99ed3b06418..ebc243f52ba7 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.275 1998/08/18 07:36:47 sos Exp $
+ *  $Id: syscons.c,v 1.276 1998/08/23 08:26:41 bde Exp $
  */
 
 #include "sc.h"
@@ -138,7 +138,6 @@ static  scr_stat    	main_console;
 static  scr_stat    	*console[MAXCONS];
 #ifdef DEVFS
 static	void		*sc_devfs_token[MAXCONS];
-static	void		*sc_vga_devfs_token;
 static	void		*sc_mouse_devfs_token;
 static	void		*sc_console_devfs_token;
 #endif
@@ -842,7 +841,6 @@ scattach(struct isa_device *dev)
     for (vc = 0; vc < MAXCONS; vc++)
         sc_devfs_token[vc] = devfs_add_devswf(&sc_cdevsw, vc, DV_CHR,
 				UID_ROOT, GID_WHEEL, 0600, "ttyv%r", vc);
-    sc_vga_devfs_token = devfs_link(sc_devfs_token[0], "vga");
     sc_mouse_devfs_token = devfs_add_devswf(&sc_cdevsw, SC_MOUSE, DV_CHR,
 				UID_ROOT, GID_WHEEL, 0600, "sysmouse");
     sc_console_devfs_token = devfs_add_devswf(&sc_cdevsw, SC_CONSOLE, DV_CHR,
diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c
index d99ed3b06418..ebc243f52ba7 100644
--- a/sys/i386/isa/syscons.c
+++ b/sys/i386/isa/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.275 1998/08/18 07:36:47 sos Exp $
+ *  $Id: syscons.c,v 1.276 1998/08/23 08:26:41 bde Exp $
  */
 
 #include "sc.h"
@@ -138,7 +138,6 @@ static  scr_stat    	main_console;
 static  scr_stat    	*console[MAXCONS];
 #ifdef DEVFS
 static	void		*sc_devfs_token[MAXCONS];
-static	void		*sc_vga_devfs_token;
 static	void		*sc_mouse_devfs_token;
 static	void		*sc_console_devfs_token;
 #endif
@@ -842,7 +841,6 @@ scattach(struct isa_device *dev)
     for (vc = 0; vc < MAXCONS; vc++)
         sc_devfs_token[vc] = devfs_add_devswf(&sc_cdevsw, vc, DV_CHR,
 				UID_ROOT, GID_WHEEL, 0600, "ttyv%r", vc);
-    sc_vga_devfs_token = devfs_link(sc_devfs_token[0], "vga");
     sc_mouse_devfs_token = devfs_add_devswf(&sc_cdevsw, SC_MOUSE, DV_CHR,
 				UID_ROOT, GID_WHEEL, 0600, "sysmouse");
     sc_console_devfs_token = devfs_add_devswf(&sc_cdevsw, SC_CONSOLE, DV_CHR,