diff --git a/sys/compat/netbsd32/files.netbsd32 b/sys/compat/netbsd32/files.netbsd32
index 06d07628ce2f..5efdc7a36d83 100644
--- a/sys/compat/netbsd32/files.netbsd32
+++ b/sys/compat/netbsd32/files.netbsd32
@@ -1,4 +1,4 @@
-#	$NetBSD: files.netbsd32,v 1.13 2003/10/15 13:32:14 fvdl Exp $
+#	$NetBSD: files.netbsd32,v 1.14 2003/10/25 16:27:25 chs Exp $
 #
 # config file description for machine-independent netbsd32 compat code.
 # included by ports that need it.
@@ -23,9 +23,9 @@ file	compat/netbsd32/netbsd32_wait.c		compat_netbsd32
 file	compat/netbsd32/netbsd32_sysent.c	compat_netbsd32
 file	compat/netbsd32/netbsd32_syscalls.c	compat_netbsd32 & syscall_debug
 
-file	compat/netbsd32/netbsd32_compat_09.c	compat_netbsd32 & compat_09
-file	compat/netbsd32/netbsd32_compat_10.c	compat_netbsd32 & compat_10
-file	compat/netbsd32/netbsd32_compat_12.c	compat_netbsd32 & compat_12
+file	compat/netbsd32/netbsd32_compat_09.c	compat_netbsd32 & (compat_09 | compat_sunos)
+file	compat/netbsd32/netbsd32_compat_10.c	compat_netbsd32 & (compat_10 | compat_sunos)
+file	compat/netbsd32/netbsd32_compat_12.c	compat_netbsd32 & (compat_12 | compat_sunos)
 file	compat/netbsd32/netbsd32_compat_13.c	compat_netbsd32 & compat_13
 file	compat/netbsd32/netbsd32_compat_14.c	compat_netbsd32 & compat_14
-file	compat/netbsd32/netbsd32_compat_43.c	compat_netbsd32 & compat_43
+file	compat/netbsd32/netbsd32_compat_43.c	compat_netbsd32 & (compat_43 | compat_sunos)
diff --git a/sys/compat/netbsd32/syscalls.master b/sys/compat/netbsd32/syscalls.master
index 49fce4197c49..beede97f6ddc 100644
--- a/sys/compat/netbsd32/syscalls.master
+++ b/sys/compat/netbsd32/syscalls.master
@@ -1,4 +1,4 @@
-	$NetBSD: syscalls.master,v 1.24 2003/10/13 18:53:35 fvdl Exp $
+	$NetBSD: syscalls.master,v 1.25 2003/10/25 16:27:25 chs Exp $
 
 ;	from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
 ;	@(#)syscalls.master	8.2 (Berkeley) 1/13/94
@@ -180,7 +180,7 @@
 106	STD		{ int netbsd32_listen(int s, int backlog); }
 107	OBSOL		vtimes
 108	COMPAT_43	{ int netbsd32_osigvec(int signum, netbsd32_sigvecp_t nsv, netbsd32_sigvecp_t osv); }
-#ifdef COMPAT_43
+#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
 109	COMPAT_43	{ int netbsd32_sigblock(int mask); }
 110	COMPAT_43	{ int netbsd32_sigsetmask(int mask); }
 #else
@@ -219,14 +219,14 @@
 140	STD		{ int netbsd32_adjtime(const netbsd32_timevalp_t delta, netbsd32_timevalp_t olddelta); }
 141	COMPAT_43	{ int netbsd32_ogetpeername(int fdes, netbsd32_caddr_t asa, netbsd32_intp alen); }
 142	COMPAT_43	{ int32_t sys_gethostid(void); } ogethostid
-#ifdef COMPAT_43
+#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
 143	COMPAT_43	{ int netbsd32_sethostid(int32_t hostid); }
 #else
 143	OBSOL		sethostid
 #endif
 144	COMPAT_43	{ int netbsd32_ogetrlimit(int which, netbsd32_orlimitp_t rlp); }
 145	COMPAT_43	{ int netbsd32_osetrlimit(int which, const netbsd32_orlimitp_t rlp); }
-#ifdef COMPAT_43
+#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
 146	COMPAT_43	{ int netbsd32_killpg(int pgid, int signum); }
 #else
 146	OBSOL		killpg