diff --git a/sys/compat/aoutm68k/aoutm68k_syscall.h b/sys/compat/aoutm68k/aoutm68k_syscall.h
index d02a52557dcb..bab174b151dd 100644
--- a/sys/compat/aoutm68k/aoutm68k_syscall.h
+++ b/sys/compat/aoutm68k/aoutm68k_syscall.h
@@ -1,15 +1,12 @@
-/* $NetBSD: aoutm68k_syscall.h,v 1.24 2006/08/01 21:05:32 martin Exp $ */
+/* $NetBSD: aoutm68k_syscall.h,v 1.25 2006/08/30 14:02:12 he Exp $ */
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.19 2006/08/01 21:05:14 martin Exp
+ * created from	NetBSD: syscalls.master,v 1.20 2006/08/30 14:01:25 he Exp 
  */
 
-#ifndef _AOUTM68K_SYS_SYSCALL_H_
-#define	_AOUTM68K_SYS_SYSCALL_H_
-
 /* syscall: "syscall" ret: "int" args: "int" "..." */
 #define	AOUTM68K_SYS_syscall	0
 
@@ -98,9 +95,13 @@
 /* syscall: "geteuid" ret: "uid_t" args: */
 #define	AOUTM68K_SYS_geteuid	25
 
+#if defined(PTRACE) || !defined(_KERNEL)
 /* syscall: "ptrace" ret: "int" args: "int" "pid_t" "caddr_t" "int" */
 #define	AOUTM68K_SYS_ptrace	26
 
+#else
+				/* 26 is excluded ptrace */
+#endif
 /* syscall: "recvmsg" ret: "ssize_t" args: "int" "struct msghdr *" "int" */
 #define	AOUTM68K_SYS_recvmsg	27
 
@@ -992,4 +993,3 @@
 
 #define	AOUTM68K_SYS_MAXSYSCALL	308
 #define	AOUTM68K_SYS_NSYSENT	512
-#endif /* _AOUTM68K_SYS_SYSCALL_H_ */
diff --git a/sys/compat/aoutm68k/aoutm68k_syscallargs.h b/sys/compat/aoutm68k/aoutm68k_syscallargs.h
index d8131b3fb643..111b7db99dbe 100644
--- a/sys/compat/aoutm68k/aoutm68k_syscallargs.h
+++ b/sys/compat/aoutm68k/aoutm68k_syscallargs.h
@@ -1,14 +1,14 @@
-/* $NetBSD: aoutm68k_syscallargs.h,v 1.23 2006/08/01 21:05:32 martin Exp $ */
+/* $NetBSD: aoutm68k_syscallargs.h,v 1.24 2006/08/30 14:02:12 he Exp $ */
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.19 2006/08/01 21:05:14 martin Exp
+ * created from	NetBSD: syscalls.master,v 1.20 2006/08/30 14:01:25 he Exp 
  */
 
-#ifndef _AOUTM68K_SYS_SYSCALLARGS_H_
-#define	_AOUTM68K_SYS_SYSCALLARGS_H_
+#ifndef _AOUTM68K_SYS__SYSCALLARGS_H_
+#define	_AOUTM68K_SYS__SYSCALLARGS_H_
 
 #ifdef	syscallarg
 #undef	syscallarg
@@ -35,6 +35,9 @@
 #if defined(COMPAT_43) || !defined(_KERNEL)
 #else
 #endif
+#if defined(PTRACE) || !defined(_KERNEL)
+#else
+#endif
 #if defined(COMPAT_43) || !defined(_KERNEL)
 
 struct aoutm68k_compat_43_sys_stat_args {
@@ -297,8 +300,11 @@ int	sys_getuid(struct lwp *, void *, register_t *);
 
 int	sys_geteuid(struct lwp *, void *, register_t *);
 
+#if defined(PTRACE) || !defined(_KERNEL)
 int	sys_ptrace(struct lwp *, void *, register_t *);
 
+#else
+#endif
 int	sys_recvmsg(struct lwp *, void *, register_t *);
 
 int	sys_sendmsg(struct lwp *, void *, register_t *);
@@ -875,4 +881,4 @@ int	sys_getcontext(struct lwp *, void *, register_t *);
 
 int	sys_setcontext(struct lwp *, void *, register_t *);
 
-#endif /* _AOUTM68K_SYS_SYSCALLARGS_H_ */
+#endif /* _AOUTM68K_SYS__SYSCALLARGS_H_ */
diff --git a/sys/compat/aoutm68k/aoutm68k_syscalls.c b/sys/compat/aoutm68k/aoutm68k_syscalls.c
index cf56aa077d0c..4898e58be4ee 100644
--- a/sys/compat/aoutm68k/aoutm68k_syscalls.c
+++ b/sys/compat/aoutm68k/aoutm68k_syscalls.c
@@ -1,14 +1,14 @@
-/* $NetBSD: aoutm68k_syscalls.c,v 1.21 2006/08/01 21:05:32 martin Exp $ */
+/* $NetBSD: aoutm68k_syscalls.c,v 1.22 2006/08/30 14:02:12 he Exp $ */
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.19 2006/08/01 21:05:14 martin Exp
+ * created from	NetBSD: syscalls.master,v 1.20 2006/08/30 14:01:25 he Exp 
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aoutm68k_syscalls.c,v 1.21 2006/08/01 21:05:32 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aoutm68k_syscalls.c,v 1.22 2006/08/30 14:02:12 he Exp $");
 
 #if defined(_KERNEL_OPT)
 #if defined(_KERNEL_OPT)
@@ -69,7 +69,11 @@ const char *const aoutm68k_syscallnames[] = {
 	"setuid",			/* 23 = setuid */
 	"getuid",			/* 24 = getuid */
 	"geteuid",			/* 25 = geteuid */
+#if defined(PTRACE) || !defined(_KERNEL)
 	"ptrace",			/* 26 = ptrace */
+#else
+	"#26 (excluded ptrace)",		/* 26 = excluded ptrace */
+#endif
 	"recvmsg",			/* 27 = recvmsg */
 	"sendmsg",			/* 28 = sendmsg */
 	"recvfrom",			/* 29 = recvfrom */
diff --git a/sys/compat/aoutm68k/aoutm68k_sysent.c b/sys/compat/aoutm68k/aoutm68k_sysent.c
index 7bd6ad09e6d6..3f706355abf1 100644
--- a/sys/compat/aoutm68k/aoutm68k_sysent.c
+++ b/sys/compat/aoutm68k/aoutm68k_sysent.c
@@ -1,14 +1,14 @@
-/* $NetBSD: aoutm68k_sysent.c,v 1.25 2006/08/01 21:05:32 martin Exp $ */
+/* $NetBSD: aoutm68k_sysent.c,v 1.26 2006/08/30 14:02:12 he Exp $ */
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.19 2006/08/01 21:05:14 martin Exp
+ * created from	NetBSD: syscalls.master,v 1.20 2006/08/30 14:01:25 he Exp 
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aoutm68k_sysent.c,v 1.25 2006/08/01 21:05:32 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aoutm68k_sysent.c,v 1.26 2006/08/30 14:02:12 he Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ktrace.h"
@@ -98,8 +98,13 @@ struct sysent aoutm68k_sysent[] = {
 	    sys_getuid },			/* 24 = getuid */
 	{ 0, 0, 0,
 	    sys_geteuid },			/* 25 = geteuid */
+#if defined(PTRACE) || !defined(_KERNEL)
 	{ 4, s(struct sys_ptrace_args), 0,
 	    sys_ptrace },			/* 26 = ptrace */
+#else
+	{ 0, 0, 0,
+	    sys_nosys },			/* 26 = excluded ptrace */
+#endif
 	{ 3, s(struct sys_recvmsg_args), 0,
 	    sys_recvmsg },			/* 27 = recvmsg */
 	{ 3, s(struct sys_sendmsg_args), 0,