diff --git a/sys/compat/linux32/arch/amd64/linux32_syscall.h b/sys/compat/linux32/arch/amd64/linux32_syscall.h
index d8facd9a441f..6c1452f8873a 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.15 2007/03/05 05:10:04 christos Exp $ */
+/* $NetBSD: linux32_syscall.h,v 1.16 2007/04/11 11:51:19 njoly Exp $ */
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.12 2007/03/04 06:01:25 christos Exp
+ * created from	NetBSD: syscalls.master,v 1.14 2007/04/11 11:45:55 njoly Exp
  */
 
 #ifndef _LINUX32_SYS_SYSCALL_H_
@@ -251,6 +251,9 @@
 /* syscall: "setpriority" ret: "int" args: "int" "int" "int" */
 #define	LINUX32_SYS_setpriority	97
 
+/* syscall: "statfs" ret: "int" args: "const netbsd32_charp" "linux32_statfsp" */
+#define	LINUX32_SYS_statfs	99
+
 /* syscall: "socketcall" ret: "int" args: "int" "netbsd32_voidp" */
 #define	LINUX32_SYS_socketcall	102
 
diff --git a/sys/compat/linux32/arch/amd64/linux32_syscallargs.h b/sys/compat/linux32/arch/amd64/linux32_syscallargs.h
index 12dde3221d33..258f1b6cfd99 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.15 2007/03/05 05:10:04 christos Exp $ */
+/* $NetBSD: linux32_syscallargs.h,v 1.16 2007/04/11 11:51:20 njoly Exp $ */
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.12 2007/03/04 06:01:25 christos Exp
+ * created from	NetBSD: syscalls.master,v 1.14 2007/04/11 11:45:55 njoly Exp
  */
 
 #ifndef _LINUX32_SYS_SYSCALLARGS_H_
@@ -240,6 +240,11 @@ struct linux32_sys_setpriority_args {
 	syscallarg(int) prio;
 };
 
+struct linux32_sys_statfs_args {
+	syscallarg(const netbsd32_charp) path;
+	syscallarg(linux32_statfsp) sp;
+};
+
 struct linux32_sys_socketcall_args {
 	syscallarg(int) what;
 	syscallarg(netbsd32_voidp) args;
@@ -557,6 +562,8 @@ int	linux32_sys_getpriority(struct lwp *, void *, register_t *);
 
 int	linux32_sys_setpriority(struct lwp *, void *, register_t *);
 
+int	linux32_sys_statfs(struct lwp *, void *, register_t *);
+
 int	linux32_sys_socketcall(struct lwp *, void *, register_t *);
 
 int	netbsd32_setitimer(struct lwp *, void *, register_t *);
diff --git a/sys/compat/linux32/arch/amd64/linux32_syscalls.c b/sys/compat/linux32/arch/amd64/linux32_syscalls.c
index 3a849e8ac69c..65e5f6f0fd2e 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.15 2007/03/05 05:10:04 christos Exp $ */
+/* $NetBSD: linux32_syscalls.c,v 1.16 2007/04/11 11:51:20 njoly Exp $ */
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.12 2007/03/04 06:01:25 christos Exp
+ * created from	NetBSD: syscalls.master,v 1.14 2007/04/11 11:45:55 njoly Exp
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_syscalls.c,v 1.15 2007/03/05 05:10:04 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_syscalls.c,v 1.16 2007/04/11 11:51:20 njoly Exp $");
 
 #if defined(_KERNEL_OPT)
 #if defined(_KERNEL_OPT)
@@ -135,7 +135,7 @@ const char *const linux32_syscallnames[] = {
 	"getpriority",			/* 96 = getpriority */
 	"setpriority",			/* 97 = setpriority */
 	"#98 (unimplemented profil)",		/* 98 = unimplemented profil */
-	"#99 (unimplemented statfs)",		/* 99 = unimplemented statfs */
+	"statfs",			/* 99 = statfs */
 	"#100 (unimplemented fstatfs)",		/* 100 = unimplemented fstatfs */
 	"#101 (unimplemented ioperm)",		/* 101 = unimplemented ioperm */
 	"socketcall",			/* 102 = socketcall */
diff --git a/sys/compat/linux32/arch/amd64/linux32_sysent.c b/sys/compat/linux32/arch/amd64/linux32_sysent.c
index 0d0b2d7c23d7..e7c23bd91b30 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.15 2007/03/05 05:10:04 christos Exp $ */
+/* $NetBSD: linux32_sysent.c,v 1.16 2007/04/11 11:51:20 njoly Exp $ */
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.12 2007/03/04 06:01:25 christos Exp
+ * created from	NetBSD: syscalls.master,v 1.14 2007/04/11 11:45:55 njoly Exp
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_sysent.c,v 1.15 2007/03/05 05:10:04 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_sysent.c,v 1.16 2007/04/11 11:51:20 njoly Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_43.h"
@@ -234,8 +234,8 @@ struct sysent linux32_sysent[] = {
 	    linux32_sys_setpriority },		/* 97 = setpriority */
 	{ 0, 0, 0,
 	    linux_sys_nosys },			/* 98 = unimplemented profil */
-	{ 0, 0, 0,
-	    linux_sys_nosys },			/* 99 = unimplemented statfs */
+	{ 2, s(struct linux32_sys_statfs_args), 0,
+	    linux32_sys_statfs },		/* 99 = statfs */
 	{ 0, 0, 0,
 	    linux_sys_nosys },			/* 100 = unimplemented fstatfs */
 	{ 0, 0, 0,