diff --git a/sys/arch/sparc64/include/z8530var.h b/sys/arch/sparc64/include/z8530var.h
index 61b1a4f2cf1a..512a0c9940dd 100644
--- a/sys/arch/sparc64/include/z8530var.h
+++ b/sys/arch/sparc64/include/z8530var.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: z8530var.h,v 1.3 2000/07/09 21:58:44 eeh Exp $	*/
+/*	$NetBSD: z8530var.h,v 1.4 2000/11/08 23:41:42 eeh Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -47,6 +47,16 @@
 #include <machine/bus.h>
 #include <dev/ic/z8530sc.h>
 
+/*
+ * Need to override cn_console_dev() for zstty and zskbd.
+ */
+#ifdef cn_isconsole
+#undef cn_isconsole
+#endif
+extern struct consdev *cn_hw;
+extern struct consdev *cn_tab;
+#define cn_isconsole(d)	((d) == cn_tab->cn_dev || (d) == cn_hw->cn_dev)
+
 struct zsc_softc {
 	struct device		zsc_dev;	/* base device */
 	bus_space_tag_t		zsc_bustag;	/* bus space/dma tags */
diff --git a/sys/dev/sun/sunkbd.c b/sys/dev/sun/sunkbd.c
index 6b639dcf67ac..68b8c39a1dc7 100644
--- a/sys/dev/sun/sunkbd.c
+++ b/sys/dev/sun/sunkbd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sunkbd.c,v 1.3 2000/11/01 23:57:14 eeh Exp $	*/
+/*	$NetBSD: sunkbd.c,v 1.4 2000/11/08 23:44:01 eeh Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -159,6 +159,7 @@ sunkbd_attach(parent, self, aux)
 	cc->cc_iclose = kbd_cc_close;
 	cc->cc_upstream = NULL;
 	if (args->kmta_consdev) {
+		char magic[4];
 
 		/*
 		 * Hookup ourselves as the console input channel
@@ -171,6 +172,12 @@ sunkbd_attach(parent, self, aux)
 		args->kmta_consdev = cn_tab;
 		k->k_isconsole = 1;
 		printf(" (console input)");
+
+		/* Set magic to "L1-A" */
+		magic[0] = KBD_L1;
+		magic[1] = KBD_A;
+		magic[2] = 0;
+		cn_set_magic(magic);
 	} else {
 		extern void kd_attach_input(struct cons_channel *);