diff --git a/sys/compat/sunos/sunos_syscall.h b/sys/compat/sunos/sunos_syscall.h
index 5fb8a7ca7ef9..a08ab744c8a0 100644
--- a/sys/compat/sunos/sunos_syscall.h
+++ b/sys/compat/sunos/sunos_syscall.h
@@ -1,10 +1,10 @@
-/* $NetBSD: sunos_syscall.h,v 1.74 2006/07/13 23:41:36 pavel Exp $ */
+/* $NetBSD: sunos_syscall.h,v 1.75 2006/08/30 23:00:45 he Exp $ */
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.62 2005/12/11 12:20:23 christos Exp
+ * created from	NetBSD: syscalls.master,v 1.64 2006/08/30 23:00:06 he Exp
  */
 
 #ifndef _SUNOS_SYS_SYSCALL_H_
@@ -79,9 +79,13 @@
 /* syscall: "stime" ret: "int" args: "time_t *" */
 #define	SUNOS_SYS_stime	25
 
+#if defined(PTRACE) || !defined(_KERNEL)
 /* syscall: "ptrace" ret: "long" args: "int" "pid_t" "caddr_t" "int" "char *" */
 #define	SUNOS_SYS_ptrace	26
 
+#else
+				/* 26 is excluded ptrace */
+#endif
 /* syscall: "access" ret: "int" args: "const char *" "int" */
 #define	SUNOS_SYS_access	33
 
diff --git a/sys/compat/sunos/sunos_syscallargs.h b/sys/compat/sunos/sunos_syscallargs.h
index 1d31b8fe3098..327802f23841 100644
--- a/sys/compat/sunos/sunos_syscallargs.h
+++ b/sys/compat/sunos/sunos_syscallargs.h
@@ -1,10 +1,10 @@
-/* $NetBSD: sunos_syscallargs.h,v 1.58 2006/07/13 23:41:36 pavel Exp $ */
+/* $NetBSD: sunos_syscallargs.h,v 1.59 2006/08/30 23:00:45 he Exp $ */
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.62 2005/12/11 12:20:23 christos Exp
+ * created from	NetBSD: syscalls.master,v 1.64 2006/08/30 23:00:06 he Exp
  */
 
 #ifndef _SUNOS_SYS_SYSCALLARGS_H_
@@ -59,6 +59,7 @@ struct sunos_sys_mknod_args {
 struct sunos_sys_stime_args {
 	syscallarg(time_t *) tp;
 };
+#if defined(PTRACE) || !defined(_KERNEL)
 
 struct sunos_sys_ptrace_args {
 	syscallarg(int) req;
@@ -67,6 +68,8 @@ struct sunos_sys_ptrace_args {
 	syscallarg(int) data;
 	syscallarg(char *) addr2;
 };
+#else
+#endif
 
 struct sunos_sys_access_args {
 	syscallarg(const char *) path;
@@ -305,8 +308,11 @@ int	sys_getuid_with_euid(struct lwp *, void *, register_t *);
 
 int	sunos_sys_stime(struct lwp *, void *, register_t *);
 
+#if defined(PTRACE) || !defined(_KERNEL)
 int	sunos_sys_ptrace(struct lwp *, void *, register_t *);
 
+#else
+#endif
 int	sunos_sys_access(struct lwp *, void *, register_t *);
 
 int	sys_sync(struct lwp *, void *, register_t *);
diff --git a/sys/compat/sunos/sunos_syscalls.c b/sys/compat/sunos/sunos_syscalls.c
index 780560f70357..2ba36f2d85f2 100644
--- a/sys/compat/sunos/sunos_syscalls.c
+++ b/sys/compat/sunos/sunos_syscalls.c
@@ -1,14 +1,14 @@
-/* $NetBSD: sunos_syscalls.c,v 1.73 2006/07/13 23:41:36 pavel Exp $ */
+/* $NetBSD: sunos_syscalls.c,v 1.74 2006/08/30 23:00:45 he Exp $ */
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.62 2005/12/11 12:20:23 christos Exp
+ * created from	NetBSD: syscalls.master,v 1.64 2006/08/30 23:00:06 he Exp
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunos_syscalls.c,v 1.73 2006/07/13 23:41:36 pavel Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos_syscalls.c,v 1.74 2006/08/30 23:00:45 he Exp $");
 
 #if defined(_KERNEL_OPT)
 #if defined(_KERNEL_OPT)
@@ -54,7 +54,11 @@ const char *const sunos_syscallnames[] = {
 	"setuid",			/* 23 = setuid */
 	"getuid_with_euid",			/* 24 = getuid_with_euid */
 	"stime",			/* 25 = stime */
+#if defined(PTRACE) || !defined(_KERNEL)
 	"ptrace",			/* 26 = ptrace */
+#else
+	"#26 (excluded ptrace)",		/* 26 = excluded ptrace */
+#endif
 	"#27 (unimplemented old_sunos_alarm)",		/* 27 = unimplemented old_sunos_alarm */
 	"#28 (unimplemented old_sunos_fstat)",		/* 28 = unimplemented old_sunos_fstat */
 	"#29 (unimplemented old_sunos_pause)",		/* 29 = unimplemented old_sunos_pause */
diff --git a/sys/compat/sunos/sunos_sysent.c b/sys/compat/sunos/sunos_sysent.c
index 9b4acfcdf81d..0d80a562d0bf 100644
--- a/sys/compat/sunos/sunos_sysent.c
+++ b/sys/compat/sunos/sunos_sysent.c
@@ -1,14 +1,14 @@
-/* $NetBSD: sunos_sysent.c,v 1.68 2006/07/13 23:41:36 pavel Exp $ */
+/* $NetBSD: sunos_sysent.c,v 1.69 2006/08/30 23:00:45 he Exp $ */
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.62 2005/12/11 12:20:23 christos Exp
+ * created from	NetBSD: syscalls.master,v 1.64 2006/08/30 23:00:06 he Exp
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunos_sysent.c,v 1.68 2006/07/13 23:41:36 pavel Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos_sysent.c,v 1.69 2006/08/30 23:00:45 he Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_nfsserver.h"
@@ -80,8 +80,13 @@ struct sysent sunos_sysent[] = {
 	    sys_getuid_with_euid },		/* 24 = getuid_with_euid */
 	{ 1, s(struct sunos_sys_stime_args), 0,
 	    sunos_sys_stime },			/* 25 = stime */
+#if defined(PTRACE) || !defined(_KERNEL)
 	{ 5, s(struct sunos_sys_ptrace_args), 0,
 	    sunos_sys_ptrace },			/* 26 = ptrace */
+#else
+	{ 0, 0, 0,
+	    sys_nosys },			/* 26 = excluded ptrace */
+#endif
 	{ 0, 0, 0,
 	    sys_nosys },			/* 27 = unimplemented old_sunos_alarm */
 	{ 0, 0, 0,