diff --git a/sys/compat/linux32/arch/amd64/linux32_syscall.h b/sys/compat/linux32/arch/amd64/linux32_syscall.h
index 637c6021802c..58908be518c3 100644
--- a/sys/compat/linux32/arch/amd64/linux32_syscall.h
+++ b/sys/compat/linux32/arch/amd64/linux32_syscall.h
@@ -1,10 +1,10 @@
-/* $NetBSD: linux32_syscall.h,v 1.37 2008/05/20 17:33:13 njoly Exp $ */
+/* $NetBSD: linux32_syscall.h,v 1.38 2008/06/16 20:00:53 christos Exp $ */
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.34 2008/05/20 17:31:56 njoly Exp
+ * created from	NetBSD: syscalls.master,v 1.35 2008/06/16 19:57:43 christos Exp
  */
 
 #ifndef _LINUX32_SYS_SYSCALL_H_
@@ -82,6 +82,9 @@
 /* syscall: "stime" ret: "int" args: "linux32_timep_t" */
 #define	LINUX32_SYS_stime	25
 
+/* syscall: "ptrace" ret: "int" args: "int" "int" "int" "int" */
+#define	LINUX32_SYS_ptrace	26
+
 /* syscall: "alarm" ret: "int" args: "unsigned int" */
 #define	LINUX32_SYS_alarm	27
 
diff --git a/sys/compat/linux32/arch/amd64/linux32_syscallargs.h b/sys/compat/linux32/arch/amd64/linux32_syscallargs.h
index d836f80cd109..5000be518fc9 100644
--- a/sys/compat/linux32/arch/amd64/linux32_syscallargs.h
+++ b/sys/compat/linux32/arch/amd64/linux32_syscallargs.h
@@ -1,10 +1,10 @@
-/* $NetBSD: linux32_syscallargs.h,v 1.37 2008/05/20 17:33:13 njoly Exp $ */
+/* $NetBSD: linux32_syscallargs.h,v 1.38 2008/06/16 20:00:53 christos Exp $ */
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.34 2008/05/20 17:31:56 njoly Exp
+ * created from	NetBSD: syscalls.master,v 1.35 2008/06/16 19:57:43 christos Exp
  */
 
 #ifndef _LINUX32_SYS_SYSCALLARGS_H_
@@ -105,6 +105,14 @@ struct linux32_sys_stime_args {
 };
 check_syscall_args(linux32_sys_stime)
 
+struct linux32_sys_ptrace_args {
+	syscallarg(int) request;
+	syscallarg(int) pid;
+	syscallarg(int) addr;
+	syscallarg(int) data;
+};
+check_syscall_args(linux32_sys_ptrace)
+
 struct linux32_sys_alarm_args {
 	syscallarg(unsigned int) secs;
 };
@@ -717,6 +725,8 @@ int	sys_getuid(struct lwp *, const void *, register_t *);
 
 int	linux32_sys_stime(struct lwp *, const struct linux32_sys_stime_args *, register_t *);
 
+int	linux32_sys_ptrace(struct lwp *, const struct linux32_sys_ptrace_args *, register_t *);
+
 int	linux32_sys_alarm(struct lwp *, const struct linux32_sys_alarm_args *, register_t *);
 
 int	linux_sys_pause(struct lwp *, const void *, register_t *);
diff --git a/sys/compat/linux32/arch/amd64/linux32_syscalls.c b/sys/compat/linux32/arch/amd64/linux32_syscalls.c
index 35af938596ad..7037035bb66f 100644
--- a/sys/compat/linux32/arch/amd64/linux32_syscalls.c
+++ b/sys/compat/linux32/arch/amd64/linux32_syscalls.c
@@ -1,14 +1,14 @@
-/* $NetBSD: linux32_syscalls.c,v 1.37 2008/05/20 17:33:13 njoly Exp $ */
+/* $NetBSD: linux32_syscalls.c,v 1.38 2008/06/16 20:00:53 christos Exp $ */
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.34 2008/05/20 17:31:56 njoly Exp
+ * created from	NetBSD: syscalls.master,v 1.35 2008/06/16 19:57:43 christos Exp
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_syscalls.c,v 1.37 2008/05/20 17:33:13 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_syscalls.c,v 1.38 2008/06/16 20:00:53 christos Exp $");
 
 #if defined(_KERNEL_OPT)
 #if defined(_KERNEL_OPT)
@@ -62,7 +62,7 @@ const char *const linux32_syscallnames[] = {
 	/*  23 */	"linux_setuid16",
 	/*  24 */	"linux_getuid16",
 	/*  25 */	"stime",
-	/*  26 */	"#26 (unimplemented ptrace)",
+	/*  26 */	"ptrace",
 	/*  27 */	"alarm",
 	/*  28 */	"#28 (obsolete ofstat)",
 	/*  29 */	"pause",
diff --git a/sys/compat/linux32/arch/amd64/linux32_sysent.c b/sys/compat/linux32/arch/amd64/linux32_sysent.c
index cd54d2438de7..ea54e69b5ad3 100644
--- a/sys/compat/linux32/arch/amd64/linux32_sysent.c
+++ b/sys/compat/linux32/arch/amd64/linux32_sysent.c
@@ -1,14 +1,14 @@
-/* $NetBSD: linux32_sysent.c,v 1.37 2008/05/20 17:33:13 njoly Exp $ */
+/* $NetBSD: linux32_sysent.c,v 1.38 2008/06/16 20:00:53 christos Exp $ */
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.34 2008/05/20 17:31:56 njoly Exp
+ * created from	NetBSD: syscalls.master,v 1.35 2008/06/16 19:57:43 christos Exp
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_sysent.c,v 1.37 2008/05/20 17:33:13 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_sysent.c,v 1.38 2008/06/16 20:00:53 christos Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_43.h"
@@ -90,8 +90,8 @@ struct sysent linux32_sysent[] = {
 	    (sy_call_t *)sys_getuid },		/* 24 = linux_getuid16 */
 	{ ns(struct linux32_sys_stime_args), 0,
 	    (sy_call_t *)linux32_sys_stime },	/* 25 = stime */
-	{ 0, 0, 0,
-	    linux_sys_nosys },			/* 26 = unimplemented ptrace */
+	{ ns(struct linux32_sys_ptrace_args), 0,
+	    (sy_call_t *)linux32_sys_ptrace },	/* 26 = ptrace */
 	{ ns(struct linux32_sys_alarm_args), 0,
 	    (sy_call_t *)linux32_sys_alarm },	/* 27 = alarm */
 	{ 0, 0, 0,