Index: HelenOS.config
===================================================================
--- HelenOS.config	(revision e677b08a74ba5a10ab24c754cc6d446088e52d25)
+++ HelenOS.config	(revision a27d1c5f6b2a36381d34690f5efff9e67bd54a07)
@@ -562,4 +562,16 @@
 ! CONFIG_OPTIMIZE_FOR_SIZE (n/y)
 
+% Number of consoles
+@ "1"
+@ "2"
+@ "3"
+@ "4"
+@ "5"
+@ "6"
+! CONFIG_VC_COUNT(choice)
+
+%Kernel log on console 6
+! CONFIG_KERNEL_LOG_VC_6 (y/n)
+
 % Barebone build with essential binaries only 
 ! CONFIG_BAREBONE (n/y)
Index: defaults/amd64/Makefile.config
===================================================================
--- defaults/amd64/Makefile.config	(revision e677b08a74ba5a10ab24c754cc6d446088e52d25)
+++ defaults/amd64/Makefile.config	(revision a27d1c5f6b2a36381d34690f5efff9e67bd54a07)
@@ -25,4 +25,7 @@
 # Kernel console support
 CONFIG_KCONSOLE = y
+
+# Number of shell consoles
+CONFIG_VC_COUNT = 5
 
 # Kernel symbol information
Index: defaults/arm32/Makefile.config
===================================================================
--- defaults/arm32/Makefile.config	(revision e677b08a74ba5a10ab24c754cc6d446088e52d25)
+++ defaults/arm32/Makefile.config	(revision a27d1c5f6b2a36381d34690f5efff9e67bd54a07)
@@ -16,4 +16,7 @@
 # Kernel console support
 CONFIG_KCONSOLE = y
+
+# Number of shell consoles
+CONFIG_VC_COUNT = 5
 
 # Kernel symbol information
Index: defaults/ia32/Makefile.config
===================================================================
--- defaults/ia32/Makefile.config	(revision e677b08a74ba5a10ab24c754cc6d446088e52d25)
+++ defaults/ia32/Makefile.config	(revision a27d1c5f6b2a36381d34690f5efff9e67bd54a07)
@@ -31,4 +31,7 @@
 # Kernel console support
 CONFIG_KCONSOLE = y
+
+# Number of shell consoles
+CONFIG_VC_COUNT = 5
 
 # Kernel symbol information
Index: defaults/ia64/Makefile.config
===================================================================
--- defaults/ia64/Makefile.config	(revision e677b08a74ba5a10ab24c754cc6d446088e52d25)
+++ defaults/ia64/Makefile.config	(revision a27d1c5f6b2a36381d34690f5efff9e67bd54a07)
@@ -29,4 +29,7 @@
 CONFIG_KCONSOLE = y
 
+# Number of shell consoles
+CONFIG_VC_COUNT = 5
+
 # Kernel symbol information
 CONFIG_SYMTAB = y
Index: defaults/mips32/Makefile.config
===================================================================
--- defaults/mips32/Makefile.config	(revision e677b08a74ba5a10ab24c754cc6d446088e52d25)
+++ defaults/mips32/Makefile.config	(revision a27d1c5f6b2a36381d34690f5efff9e67bd54a07)
@@ -22,4 +22,7 @@
 # Kernel console support
 CONFIG_KCONSOLE = y
+
+# Number of shell consoles
+CONFIG_VC_COUNT = 5
 
 # Kernel symbol information
Index: defaults/mips64/Makefile.config
===================================================================
--- defaults/mips64/Makefile.config	(revision e677b08a74ba5a10ab24c754cc6d446088e52d25)
+++ defaults/mips64/Makefile.config	(revision a27d1c5f6b2a36381d34690f5efff9e67bd54a07)
@@ -22,4 +22,7 @@
 # Kernel console support
 CONFIG_KCONSOLE = y
+
+# Number of shell consoles
+CONFIG_VC_COUNT = 5
 
 # Kernel symbol information
Index: defaults/ppc32/Makefile.config
===================================================================
--- defaults/ppc32/Makefile.config	(revision e677b08a74ba5a10ab24c754cc6d446088e52d25)
+++ defaults/ppc32/Makefile.config	(revision a27d1c5f6b2a36381d34690f5efff9e67bd54a07)
@@ -16,4 +16,7 @@
 # Kernel console support
 CONFIG_KCONSOLE = y
+
+# Number of shell consoles
+CONFIG_VC_COUNT = 5
 
 # Kernel symbol information
Index: defaults/sparc64/Makefile.config
===================================================================
--- defaults/sparc64/Makefile.config	(revision e677b08a74ba5a10ab24c754cc6d446088e52d25)
+++ defaults/sparc64/Makefile.config	(revision a27d1c5f6b2a36381d34690f5efff9e67bd54a07)
@@ -32,4 +32,7 @@
 CONFIG_KCONSOLE = y
 
+# Number of shell consoles
+CONFIG_VC_COUNT = 5
+
 # Kernel symbol information
 CONFIG_SYMTAB = y
Index: defaults/special/Makefile.config
===================================================================
--- defaults/special/Makefile.config	(revision e677b08a74ba5a10ab24c754cc6d446088e52d25)
+++ defaults/special/Makefile.config	(revision a27d1c5f6b2a36381d34690f5efff9e67bd54a07)
@@ -17,4 +17,7 @@
 CONFIG_KCONSOLE = y
 
+# Number of shell consoles
+CONFIG_VC_COUNT = 5
+
 # Kernel symbol information
 CONFIG_SYMTAB = y
Index: uspace/app/init/init.c
===================================================================
--- uspace/app/init/init.c	(revision e677b08a74ba5a10ab24c754cc6d446088e52d25)
+++ uspace/app/init/init.c	(revision a27d1c5f6b2a36381d34690f5efff9e67bd54a07)
@@ -340,11 +340,16 @@
 	
 	spawn("/srv/hound");
-	getterm("term/vc0", "/app/bdsh", true);
-	getterm("term/vc1", "/app/bdsh", false);
-	getterm("term/vc2", "/app/bdsh", false);
-	getterm("term/vc3", "/app/bdsh", false);
-	getterm("term/vc4", "/app/bdsh", false);
-	getterm("term/vc5", "/app/bdsh", false);
+	switch((unsigned)CONFIG_VC_COUNT) {
+	default:
+	case 6:	getterm("term/vc5", "/app/bdsh", false);
+	case 5: getterm("term/vc4", "/app/bdsh", false);
+	case 4: getterm("term/vc3", "/app/bdsh", false);
+	case 3: getterm("term/vc2", "/app/bdsh", false);
+	case 2: getterm("term/vc1", "/app/bdsh", false);
+	case 1: getterm("term/vc0", "/app/bdsh", true);
+	}
+#ifdef CONFIG_KERNEL_LOG_VC_6
 	getterm("term/vc6", "/app/klog", false);
+#endif
 	
 	return 0;