diff --git a/sys/arch/vax/vsa/dz_vsbus.c b/sys/arch/vax/vsa/dz_vsbus.c
index 7906c3a093b1..bf2a428c076b 100644
--- a/sys/arch/vax/vsa/dz_vsbus.c
+++ b/sys/arch/vax/vsa/dz_vsbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dz_vsbus.c,v 1.12 1999/05/20 23:00:58 ragge Exp $ */
+/*	$NetBSD: dz_vsbus.c,v 1.13 1999/06/06 19:10:49 ragge Exp $ */
 /*
  * Copyright (c) 1998 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -53,8 +53,8 @@
 
 #include <machine/../vax/gencons.h>
 
-#include <vax/uba/dzreg.h>
-#include <vax/uba/dzvar.h>
+#include <dev/qbus/dzreg.h>
+#include <dev/qbus/dzvar.h>
 
 #include "ioconf.h"
 #include "lkc.h"
@@ -126,14 +126,20 @@ dz_vsbus_attach(parent, self, aux)
 	struct  dz_softc *sc = (void *)self;
 	struct vsbus_attach_args *va = aux;
 
-	sc->sc_dr.dr_csr = (void *)(dz_regs + 0);
-	sc->sc_dr.dr_rbuf = (void *)(dz_regs + 4);
-	sc->sc_dr.dr_dtr = (void *)(dz_regs + 9);
-	sc->sc_dr.dr_break = (void *)(dz_regs + 13);
-	sc->sc_dr.dr_tbuf = (void *)(dz_regs + 12);
-	sc->sc_dr.dr_tcr = (void *)(dz_regs + 8);
-	sc->sc_dr.dr_dcd = (void *)(dz_regs + 13);
-	sc->sc_dr.dr_ring = (void *)(dz_regs + 13);
+	/* 
+	 * XXX - This is evil and ugly, but...
+	 * due to the nature of how bus_space_* works on VAX, this will
+	 * be perfectly good until everything is converted.
+	 */
+	sc->sc_ioh = dz_regs;
+	sc->sc_dr.dr_csr = 0;
+	sc->sc_dr.dr_rbuf = 4;
+	sc->sc_dr.dr_dtr = 9;
+	sc->sc_dr.dr_break = 13;
+	sc->sc_dr.dr_tbuf = 12;
+	sc->sc_dr.dr_tcr = 8;
+	sc->sc_dr.dr_dcd = 13;
+	sc->sc_dr.dr_ring = 13;
 
 	sc->sc_type = DZ_DZV;
 
diff --git a/sys/arch/vax/vsa/lkc.c b/sys/arch/vax/vsa/lkc.c
index 4bb794919b6b..b33b854daac4 100644
--- a/sys/arch/vax/vsa/lkc.c
+++ b/sys/arch/vax/vsa/lkc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: lkc.c,v 1.10 1999/04/29 16:58:58 ragge Exp $ */
+/*	$NetBSD: lkc.c,v 1.11 1999/06/06 19:10:49 ragge Exp $ */
 /*
  * Copyright (c) 1998 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -43,8 +43,8 @@
 
 #include <machine/vsbus.h>
 
-#include <vax/uba/dzreg.h>
-#include <vax/uba/dzvar.h>
+#include <dev/qbus/dzreg.h>
+#include <dev/qbus/dzvar.h>
 
 #include "ioconf.h"
 
@@ -82,7 +82,7 @@ lkc_attach(parent, self, aux)
 
 	printf("\n");
 	dz->sc_catch = lkc_catch; /* Catch keyb & mouse chars fast */
-	*dz->sc_dr.dr_lpr = 0x1c18; /* XXX */
+	bus_space_write_2(dz->sc_iot, dz->sc_ioh, 4, 0x1c18);
 }
 
 extern	char *q_special[];