diff --git a/sys/arch/i386/pnpbios/fdc_pnpbios.c b/sys/arch/i386/pnpbios/fdc_pnpbios.c
new file mode 100644
index 000000000000..4f57d22850aa
--- /dev/null
+++ b/sys/arch/i386/pnpbios/fdc_pnpbios.c
@@ -0,0 +1,122 @@
+/*	$NetBSD: fdc_pnpbios.c,v 1.1 2000/04/23 17:50:00 thorpej Exp $	*/
+
+/*-
+ * Copyright (c) 2000 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe.
+ *
+ * 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.
+ */
+
+/*
+ * PNPBIOS attachment for the PC Floppy Controller driver.
+ */
+
+#include "rnd.h"
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/callout.h>
+#include <sys/device.h>
+#include <sys/buf.h>
+#include <sys/queue.h>
+#if NRND > 0
+#include <sys/rnd.h>
+#endif
+
+#include <machine/bus.h>
+#include <machine/intr.h>
+
+#include <dev/isa/isavar.h>
+#include <dev/isa/isadmavar.h>
+
+#include <dev/isa/fdcvar.h>
+
+#include <i386/pnpbios/pnpbiosvar.h>
+
+int	fdc_pnpbios_match(struct device *, struct cfdata *, void *);
+void	fdc_pnpbios_attach(struct device *, struct device *, void *);
+
+struct cfattach fdc_pnpbios_ca = {
+	sizeof(struct fdc_softc), fdc_pnpbios_match,
+	    fdc_pnpbios_attach,
+};
+
+int
+fdc_pnpbios_match(struct device *parent,
+    struct cfdata *match,
+    void *aux)
+{
+	struct pnpbiosdev_attach_args *aa = aux;
+
+	if (strcmp(aa->idstr, "PNP0700") == 0)
+		return (1);
+
+	return (0);
+}
+
+void
+fdc_pnpbios_attach(struct device *parent,
+    struct device *self,
+    void *aux)
+{
+	struct fdc_softc *fdc = (void *) self;
+	struct pnpbiosdev_attach_args *aa = aux;
+
+	printf("\n");
+
+	fdc->sc_ic = aa->ic;
+
+	if (pnpbios_io_map(aa->pbt, aa->resc, 0, &fdc->sc_iot, &fdc->sc_ioh)) {
+		printf("%s: unable to map I/O space\n", fdc->sc_dev.dv_xname);
+		return;
+	}
+
+	if (pnpbios_io_map(aa->pbt, aa->resc, 1, &fdc->sc_iot,
+	    &fdc->sc_fdctlioh)) {
+		printf("%s: unable to map CTL I/O space\n",
+		    fdc->sc_dev.dv_xname);
+		return;
+	}
+
+	if (pnpbios_getdmachan(aa->pbt, aa->resc, 0, &fdc->sc_drq)) {
+		printf("%s: unable to get DMA channel\n",
+		    fdc->sc_dev.dv_xname);
+		return;
+	}
+
+	pnpbios_print_devres(self, aa);
+
+	fdc->sc_ih = pnpbios_intr_establish(aa->pbt, aa->resc, 0, IPL_BIO,
+	    fdcintr, fdc);
+
+	fdcattach(fdc);
+}
diff --git a/sys/arch/i386/pnpbios/files.pnpbios b/sys/arch/i386/pnpbios/files.pnpbios
index ac566fa9abb0..d9ed864a26a1 100644
--- a/sys/arch/i386/pnpbios/files.pnpbios
+++ b/sys/arch/i386/pnpbios/files.pnpbios
@@ -1,4 +1,4 @@
-# $NetBSD: files.pnpbios,v 1.6 2000/04/22 06:41:34 thorpej Exp $
+# $NetBSD: files.pnpbios,v 1.7 2000/04/23 17:50:00 thorpej Exp $
 
 defopt PNPBIOSVERBOSE
 
@@ -33,3 +33,6 @@ file arch/i386/pnpbios/lm_pnpbios.c lm_pnpbios
 
 attach pckbc at pnpbios with pckbc_pnpbios
 file arch/i386/pnpbios/pckbc_pnpbios.c pckbc_pnpbios
+
+attach fdc at pnpbios with fdc_pnpbios
+file arch/i386/pnpbios/fdc_pnpbios.c fdc_pnpbios