diff --git a/sys/dev/isapnp/aha_isapnp.c b/sys/dev/isapnp/aha_isapnp.c
new file mode 100644
index 000000000000..4ca44a394cfa
--- /dev/null
+++ b/sys/dev/isapnp/aha_isapnp.c
@@ -0,0 +1,138 @@
+/*	$NetBSD: aha_isapnp.c,v 1.1 1998/11/23 20:47:51 christos Exp $	*/
+
+/*-
+ * Copyright (c) 1998 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/conf.h>
+#include <sys/device.h>
+
+#include <machine/bus.h>
+
+#include <dev/scsipi/scsi_all.h>
+#include <dev/scsipi/scsipi_all.h>
+#include <dev/scsipi/scsiconf.h>
+
+#include <dev/isa/isavar.h>
+
+#include <dev/isapnp/isapnpreg.h>
+#include <dev/isapnp/isapnpvar.h>
+#include <dev/isapnp/isapnpdevs.h>
+
+
+#include <dev/ic/ahareg.h>
+#include <dev/ic/ahavar.h>
+
+int	aha_isapnp_probe __P((struct device *, struct cfdata *, void *));
+void	aha_isapnp_attach __P((struct device *, struct device *, void *));
+
+struct cfattach aha_isapnp_ca = {
+	sizeof(struct aha_softc), aha_isapnp_probe, aha_isapnp_attach
+};
+
+int
+aha_isapnp_probe(parent, match, aux)
+	struct device *parent;
+	struct cfdata *match;
+	void *aux;
+{
+	return isapnp_devmatch(aux, &isapnp_aha_devinfo);
+}
+
+void
+aha_isapnp_attach(parent, self, aux)
+	struct device *parent, *self;
+	void *aux;
+{
+	struct aha_softc *sc = (void *)self;
+	struct aha_probe_data apd;
+	struct isapnp_attach_args *ipa = aux;
+
+	printf("\n");
+
+	if (isapnp_config(ipa->ipa_iot, ipa->ipa_memt, ipa)) {
+		printf("%s: error in region allocation\n",
+		    sc->sc_dev.dv_xname);
+		return;
+	}
+
+	sc->sc_iot = ipa->ipa_iot;
+	sc->sc_ioh = ipa->ipa_io[0].h;
+	sc->sc_dmat = ipa->ipa_dmat;
+
+	if (!aha_find(sc->sc_iot, sc->sc_ioh, &apd)) {
+		printf("%s: aha_find failed\n", sc->sc_dev.dv_xname);
+		return;
+	}
+
+	if (ipa->ipa_ndrq == 0) {
+		if (apd.sc_drq != -1) {
+			printf("%s: no PnP drq, but card has one\n",
+			    sc->sc_dev.dv_xname);
+			return;
+		}
+	} else if (apd.sc_drq != ipa->ipa_drq[0].num) {
+		printf("%s: card drq # (%d) != PnP # (%d)\n",
+		    sc->sc_dev.dv_xname, apd.sc_drq, ipa->ipa_drq[0].num);
+		return;
+	} else {
+		int error = isa_dmacascade(ipa->ipa_ic, ipa->ipa_drq[0].num);
+		if (error) {
+			printf("%s: unable to cascade DRQ, error = %d\n",
+			    sc->sc_dev.dv_xname, error);
+			return;
+		}
+	}
+
+	if (apd.sc_irq != ipa->ipa_irq[0].num) {
+		printf("%s: card irq # (%d) != PnP # (%d)\n",
+		    sc->sc_dev.dv_xname, apd.sc_irq, ipa->ipa_irq[0].num);
+		return;
+	}
+
+
+	sc->sc_ih = isa_intr_establish(ipa->ipa_ic, ipa->ipa_irq[0].num,
+	    ipa->ipa_irq[0].type, IPL_BIO, aha_intr, sc);
+
+	if (sc->sc_ih == NULL) {
+		printf("%s: couldn't establish interrupt\n",
+		    sc->sc_dev.dv_xname);
+		return;
+	}
+
+	aha_attach(sc, &apd);
+}
diff --git a/sys/dev/isapnp/isapnpdevs b/sys/dev/isapnp/isapnpdevs
index c65fa789c898..0a27ac89470e 100644
--- a/sys/dev/isapnp/isapnpdevs
+++ b/sys/dev/isapnp/isapnpdevs
@@ -1,4 +1,4 @@
-$NetBSD: isapnpdevs,v 1.9 1998/11/12 14:06:34 drochner Exp $
+$NetBSD: isapnpdevs,v 1.10 1998/11/23 20:47:51 christos Exp $
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -39,6 +39,7 @@ $NetBSD: isapnpdevs,v 1.9 1998/11/12 14:06:34 drochner Exp $
 /*
  * List of known drivers
  */
+driver	aha	Adaptec SCSI
 driver	aic	Adaptec SCSI
 driver	com	National Semiconductor Serial
 driver	ep	3Com 3CXXX Ethernet
@@ -53,6 +54,11 @@ driver	wdc	Western Digital Disk Controller
 driver	wss	Microsoft Sound System
 driver	ym	Yamaha Sound
 
+/*
+ * aha
+ */
+devlogic	aha	ADP1542		Adaptec AHA-1542
+
 /*
  * aic
  */