diff --git a/console-server.c b/console-server.c
index 45dd07a..9a0d60e 100644
--- a/console-server.c
+++ b/console-server.c
@@ -71,7 +71,7 @@
 static void usage(const char *progname)
 {
 	fprintf(stderr,
-"usage: %s [options]\n"
+"usage: %s [options] <DEVICE>\n"
 "\n"
 "Options:\n"
 "  --config <FILE>  Use FILE for configuration\n"
@@ -216,8 +216,6 @@
 	char *endp;
 	int rc;
 
-	console->tty_kname = config_get_value(config, "device");
-
 	val = config_get_value(config, "lpc-address");
 	if (val) {
 		console->tty_lpc_addr = strtoul(val, &endp, 0);
@@ -504,6 +502,7 @@
 int main(int argc, char **argv)
 {
 	const char *config_filename = NULL;
+	const char *config_tty_kname = NULL;
 	struct console *console;
 	struct config *config;
 	int rc;
@@ -528,6 +527,14 @@
 		}
 	}
 
+	if (optind >= argc) {
+		warnx("Required argument <DEVICE> missing");
+		usage(argv[0]);
+		return EXIT_FAILURE;
+	}
+
+	config_tty_kname = argv[optind];
+
 	console = malloc(sizeof(struct console));
 	memset(console, 0, sizeof(*console));
 	console->pollfds = calloc(n_internal_pollfds,
@@ -539,6 +546,8 @@
 		goto out_free;
 	}
 
+	console->tty_kname = config_tty_kname;
+
 	rc = tty_init(console, config);
 	if (rc)
 		goto out_config_fini;
diff --git a/obmc-console.conf.sample b/obmc-console.conf.sample
index d473af2..647e3c7 100644
--- a/obmc-console.conf.sample
+++ b/obmc-console.conf.sample
@@ -1,6 +1,3 @@
-# Device to use for our UART console
-device = ttyUSB0
-
 # For VUART devices, we can specify the LPC address and SIRQ parameters
 lpc-address = 0x3f8
 sirq = 4