diff --git a/etc/rc.devfs b/etc/rc.devfs
index 0bd43f615a6e..52966e9a63ca 100644
--- a/etc/rc.devfs
+++ b/etc/rc.devfs
@@ -41,13 +41,13 @@ cd /dev
 # This isn't necessarily a good example, since we probably shouldn't need this.
 # However, a lot of X software depends on it.
 #
-if [ -c ttyv0 ]; then
+if [ -c ttyv0 -a ! -e vga ]; then
 	ln -fs ttyv0 vga
 fi
 
 # Commonly used by many ports
 #
-#if [ -c acd0c ]; then
+#if [ -c acd0c -a ! -e cdrom ]; then
 #	ln -fs acd0c cdrom
 #fi