diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index 5a091486731a..15e3071bb00f 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-#	$NetBSD: files.i386,v 1.159 2000/05/11 16:38:10 jdolecek Exp $
+#	$NetBSD: files.i386,v 1.160 2000/06/04 16:26:11 mycroft Exp $
 #
 # new style config file for i386 architecture
 #
@@ -313,6 +313,9 @@ file	arch/i386/i386/freebsd_machdep.c	compat_freebsd
 # a.out binary compatibility (COMPAT_AOUT)
 include "compat/aout/files.aout"
 
+# Win32 binary compatibility (COMPAT_PECOFF)
+include "compat/pecoff/files.pecoff"
+
 # OSS audio driver compatibility
 include "compat/ossaudio/files.ossaudio"
 
diff --git a/sys/conf/files b/sys/conf/files
index 81f8bf127a00..b7972002920e 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.370 2000/06/03 14:36:32 itojun Exp $
+#	$NetBSD: files,v 1.371 2000/06/04 16:26:12 mycroft Exp $
 
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
@@ -45,6 +45,7 @@ defopt	COMPAT_AOUT
 defopt	COMPAT_M68K4K
 defopt	COMPAT_VAX1K
 defopt	COMPAT_43
+defopt	COMPAT_PECOFF
 defopt  opt_compat_netbsd.h	COMPAT_09 COMPAT_10 COMPAT_11 COMPAT_12
 				COMPAT_13 COMPAT_14 COMPAT_NOMID
 
diff --git a/sys/kern/exec_conf.c b/sys/kern/exec_conf.c
index 5539b940fed1..995def1c212a 100644
--- a/sys/kern/exec_conf.c
+++ b/sys/kern/exec_conf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: exec_conf.c,v 1.41 2000/01/17 02:59:25 matt Exp $	*/
+/*	$NetBSD: exec_conf.c,v 1.42 2000/06/04 16:26:13 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994 Christopher G. Demetriou
@@ -41,6 +41,7 @@
 #include "opt_compat_netbsd32.h"
 #include "opt_compat_aout.h"
 #include "opt_compat_vax1k.h"
+#include "opt_compat_pecoff.h"
 
 #include <sys/param.h>
 #include <sys/exec.h>
@@ -74,6 +75,7 @@
 #endif
 
 #ifdef COMPAT_IBCS2
+#include <sys/exec_coff.h>
 #include <compat/ibcs2/ibcs2_exec.h>
 #endif
 
@@ -105,6 +107,11 @@
 #include <compat/aout/aout_exec.h>
 #endif
 
+#ifdef COMPAT_PECOFF
+#include <sys/exec_coff.h>
+#include <compat/pecoff/pecoff_exec.h>
+#endif
+
 struct execsw execsw[] = {
 #ifdef LKM
 	{ 0, NULL, },					/* entries for LKMs */
@@ -160,6 +167,9 @@ struct execsw execsw[] = {
 #ifdef COMPAT_VAX1K
 	{ sizeof(struct exec), exec_vax1k_makecmds, },	/* vax1k a.out */
 #endif
+#ifdef COMPAT_PECOFF
+	{ sizeof(struct exec), exec_win32_makecmds, },	/* Win32 PE/COFF */
+#endif
 };
 int nexecs = (sizeof(execsw) / sizeof(*execsw));
 int exec_maxhdrsz;