diff --git a/sys/arch/i386/stand/Makefile b/sys/arch/i386/stand/Makefile
index 08d207ceb139..11c47ea11bd2 100644
--- a/sys/arch/i386/stand/Makefile
+++ b/sys/arch/i386/stand/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.17 2002/02/19 19:49:37 thorpej Exp $
+#	$NetBSD: Makefile,v 1.18 2002/02/20 03:00:27 thorpej Exp $
 
 SUBDIR=		genprom installboot .WAIT
 
@@ -11,5 +11,6 @@ SUBDIR+=	dosboot
 SUBDIR+=	netboot
 
 SUBDIR+=	pxeboot
+SUBDIR+=	pxeboot_com0
 
 .include <bsd.subdir.mk>
diff --git a/sys/arch/i386/stand/pxeboot/Makefile b/sys/arch/i386/stand/pxeboot/Makefile
index 0f15778b313a..8b5ad00e22bf 100644
--- a/sys/arch/i386/stand/pxeboot/Makefile
+++ b/sys/arch/i386/stand/pxeboot/Makefile
@@ -1,18 +1,22 @@
-#	$NetBSD: Makefile,v 1.2 2002/02/17 20:03:11 thorpej Exp $
+#	$NetBSD: Makefile,v 1.3 2002/02/20 03:00:27 thorpej Exp $
 
 S=	${.CURDIR}/../../../../
 
-BASE?= pxeboot
+BASE?= pxeboot_ia32
 PROG= ${BASE}.bin
 MKMAN=	no
 NEWVERSWHAT=	"PXE Boot"
 STARTFILE=	${PXESTART}
 RELOC=		0x0
 
-#.PATH.c: ${.CURDIR}/../netboot
+.if (${BASE} != "pxeboot_ia32")
+.PATH.c: ${.CURDIR}/../pxeboot
+.PATH.S: ${.CURDIR}/../pxeboot
+.endif
 
 SRCS= main.c dev_net.c devopen.c conf.c exec.c pxe.c pxe_call.S
 
+.if (${BASE} == "pxeboot_ia32")
 # Various serial line configurations
 CPPFLAGS+= -DSUPPORT_SERIAL=CONSDEV_PC -DDIRECT_SERIAL
 #	or
@@ -21,6 +25,11 @@ CPPFLAGS+= -DSUPPORT_SERIAL=CONSDEV_PC -DDIRECT_SERIAL
 #CPPFLAGS+= -DSUPPORT_SERIAL=CONSDEV_AUTO 
 #	and maybe 
 #CPPFLAGS+= -DDIRECT_SERIAL -DCOMCONS_KEYPRESS -DCONSPEED=57600
+.endif
+
+.if (${BASE} == "pxeboot_ia32_com0")
+CPPFLAGS+= -DSUPPORT_SERIAL=CONSDEV_COM0 -DDIRECT_SERIAL
+.endif
 
 CPPFLAGS+= -DSUPPORT_BOOTP -DSUPPORT_DHCP
 CPPFLAGS+= -DSUPPORT_TFTP
@@ -28,8 +37,6 @@ CPPFLAGS+= -DSUPPORT_NFS
 
 CPPFLAGS+= -DPASS_MEMMAP
 
-#CPPFLAGS+= -DBOOTPASSWD
-
 #CFLAGS= -O2 -fomit-frame-pointer -fno-defer-pop
 CFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wno-main
 
@@ -38,6 +45,10 @@ SAMISCMAKEFLAGS+= SA_USE_CREAD=yes	# Read compressed kernels
 
 I386MISCMAKEFLAGS= I386_INCLUDE_DISK=no
 
+.if (${BASE} == "pxeboot_ia32")
 VERSIONFILE= ${.CURDIR}/version
+.else
+VERSIONFILE= ${.CURDIR}/../pxeboot/version
+.endif
 
 .include "../Makefile.booters"
diff --git a/sys/arch/i386/stand/pxeboot/main.c b/sys/arch/i386/stand/pxeboot/main.c
index 567d69813b94..c687b978fb2f 100644
--- a/sys/arch/i386/stand/pxeboot/main.c
+++ b/sys/arch/i386/stand/pxeboot/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.3 2002/02/17 20:14:08 thorpej Exp $	*/
+/*	$NetBSD: main.c,v 1.4 2002/02/20 03:00:27 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1996
@@ -111,7 +111,11 @@ main(void)
 {
         char c;
 
-	initio(CONSDEV_AUTO);
+#ifdef SUPPORT_SERIAL
+	initio(SUPPORT_SERIAL);
+#else
+	initio(CONSDEV_PC);
+#endif
 	gateA20();
 
 	print_banner();
diff --git a/sys/arch/i386/stand/pxeboot_com0/Makefile b/sys/arch/i386/stand/pxeboot_com0/Makefile
new file mode 100644
index 000000000000..506b7ca8637a
--- /dev/null
+++ b/sys/arch/i386/stand/pxeboot_com0/Makefile
@@ -0,0 +1,5 @@
+#	$NetBSD: Makefile,v 1.1 2002/02/20 03:00:27 thorpej Exp $
+
+BASE=	pxeboot_ia32_com0
+
+.include "../pxeboot/Makefile"