diff --git a/sys/compat/svr4/svr4_syscall.h b/sys/compat/svr4/svr4_syscall.h
index 13c5245e5018..c0844a864917 100644
--- a/sys/compat/svr4/svr4_syscall.h
+++ b/sys/compat/svr4/svr4_syscall.h
@@ -1,10 +1,10 @@
-/*	$NetBSD: svr4_syscall.h,v 1.46 1998/02/19 03:34:19 thorpej Exp $	*/
+/*	$NetBSD: svr4_syscall.h,v 1.47 1998/06/30 19:40:56 thorpej Exp $	*/
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.31 1998/02/19 00:45:12 thorpej Exp 
+ * created from	NetBSD: syscalls.master,v 1.32 1998/06/30 19:40:13 thorpej Exp 
  */
 
 /* syscall: "syscall" ret: "int" args: */
@@ -383,11 +383,11 @@
 /* syscall: "getrlimit64" ret: "int" args: "int" "struct rlimit *" */
 #define	SVR4_SYS_getrlimit64	221
 
-/* syscall: "pread64" ret: "ssize_t" args: "int" "void *" "size_t" "svr4_off64_t" */
-#define	SVR4_SYS_pread64	222
+/* syscall: "pread" ret: "ssize_t" args: "int" "void *" "size_t" "off_t" */
+#define	SVR4_SYS_pread	222
 
-/* syscall: "pwrite64" ret: "ssize_t" args: "int" "const void *" "size_t" "svr4_off64_t" */
-#define	SVR4_SYS_pwrite64	223
+/* syscall: "pwrite" ret: "ssize_t" args: "int" "const void *" "size_t" "off_t" */
+#define	SVR4_SYS_pwrite	223
 
 /* syscall: "creat64" ret: "int" args: "char *" "int" */
 #define	SVR4_SYS_creat64	224
diff --git a/sys/compat/svr4/svr4_syscallargs.h b/sys/compat/svr4/svr4_syscallargs.h
index 21ba17157a1e..9a9a9a96199d 100644
--- a/sys/compat/svr4/svr4_syscallargs.h
+++ b/sys/compat/svr4/svr4_syscallargs.h
@@ -1,10 +1,10 @@
-/*	$NetBSD: svr4_syscallargs.h,v 1.43 1998/02/19 03:34:19 thorpej Exp $	*/
+/*	$NetBSD: svr4_syscallargs.h,v 1.44 1998/06/30 19:40:56 thorpej Exp $	*/
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.31 1998/02/19 00:45:12 thorpej Exp 
+ * created from	NetBSD: syscalls.master,v 1.32 1998/06/30 19:40:13 thorpej Exp 
  */
 
 #define	syscallarg(x)	union { x datum; register_t pad; }
@@ -415,20 +415,6 @@ struct svr4_sys_getrlimit64_args {
 	syscallarg(struct rlimit *) rlp;
 };
 
-struct svr4_sys_pread64_args {
-	syscallarg(int) fd;
-	syscallarg(void *) buf;
-	syscallarg(size_t) nbyte;
-	syscallarg(svr4_off64_t) off;
-};
-
-struct svr4_sys_pwrite64_args {
-	syscallarg(int) fd;
-	syscallarg(const void *) buf;
-	syscallarg(size_t) nbyte;
-	syscallarg(svr4_off64_t) off;
-};
-
 struct svr4_sys_creat64_args {
 	syscallarg(char *) path;
 	syscallarg(int) mode;
@@ -581,8 +567,8 @@ int	svr4_sys_statvfs64	__P((struct proc *, void *, register_t *));
 int	svr4_sys_fstatvfs64	__P((struct proc *, void *, register_t *));
 int	svr4_sys_setrlimit64	__P((struct proc *, void *, register_t *));
 int	svr4_sys_getrlimit64	__P((struct proc *, void *, register_t *));
-int	svr4_sys_pread64	__P((struct proc *, void *, register_t *));
-int	svr4_sys_pwrite64	__P((struct proc *, void *, register_t *));
+int	sys_pread	__P((struct proc *, void *, register_t *));
+int	sys_pwrite	__P((struct proc *, void *, register_t *));
 int	svr4_sys_creat64	__P((struct proc *, void *, register_t *));
 int	svr4_sys_open64	__P((struct proc *, void *, register_t *));
 int	svr4_sys_socket	__P((struct proc *, void *, register_t *));
diff --git a/sys/compat/svr4/svr4_syscalls.c b/sys/compat/svr4/svr4_syscalls.c
index d265b4fb7841..70c768de99e3 100644
--- a/sys/compat/svr4/svr4_syscalls.c
+++ b/sys/compat/svr4/svr4_syscalls.c
@@ -1,10 +1,10 @@
-/*	$NetBSD: svr4_syscalls.c,v 1.45 1998/02/19 03:34:20 thorpej Exp $	*/
+/*	$NetBSD: svr4_syscalls.c,v 1.46 1998/06/30 19:40:56 thorpej Exp $	*/
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.31 1998/02/19 00:45:12 thorpej Exp 
+ * created from	NetBSD: syscalls.master,v 1.32 1998/06/30 19:40:13 thorpej Exp 
  */
 
 #if defined(_KERNEL) && !defined(_LKM)
@@ -258,8 +258,8 @@ char *svr4_syscallnames[] = {
 	"fstatvfs64",			/* 219 = fstatvfs64 */
 	"setrlimit64",			/* 220 = setrlimit64 */
 	"getrlimit64",			/* 221 = getrlimit64 */
-	"pread64",			/* 222 = pread64 */
-	"pwrite64",			/* 223 = pwrite64 */
+	"pread",			/* 222 = pread */
+	"pwrite",			/* 223 = pwrite */
 	"creat64",			/* 224 = creat64 */
 	"open64",			/* 225 = open64 */
 	"#226 (unimplemented rpcsys)",		/* 226 = unimplemented rpcsys */
diff --git a/sys/compat/svr4/svr4_sysent.c b/sys/compat/svr4/svr4_sysent.c
index 029497b455c0..003792e7d00d 100644
--- a/sys/compat/svr4/svr4_sysent.c
+++ b/sys/compat/svr4/svr4_sysent.c
@@ -1,10 +1,10 @@
-/*	$NetBSD: svr4_sysent.c,v 1.47 1998/02/19 03:34:20 thorpej Exp $	*/
+/*	$NetBSD: svr4_sysent.c,v 1.48 1998/06/30 19:40:55 thorpej Exp $	*/
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.31 1998/02/19 00:45:12 thorpej Exp 
+ * created from	NetBSD: syscalls.master,v 1.32 1998/06/30 19:40:13 thorpej Exp 
  */
 
 #include <sys/param.h>
@@ -489,10 +489,10 @@ struct sysent svr4_sysent[] = {
 	    svr4_sys_setrlimit64 },		/* 220 = setrlimit64 */
 	{ 2, s(struct svr4_sys_getrlimit64_args),
 	    svr4_sys_getrlimit64 },		/* 221 = getrlimit64 */
-	{ 4, s(struct svr4_sys_pread64_args),
-	    svr4_sys_pread64 },			/* 222 = pread64 */
-	{ 4, s(struct svr4_sys_pwrite64_args),
-	    svr4_sys_pwrite64 },		/* 223 = pwrite64 */
+	{ 4, s(struct sys_pread_args),
+	    sys_pread },			/* 222 = pread */
+	{ 4, s(struct sys_pwrite_args),
+	    sys_pwrite },			/* 223 = pwrite */
 	{ 2, s(struct svr4_sys_creat64_args),
 	    svr4_sys_creat64 },			/* 224 = creat64 */
 	{ 3, s(struct svr4_sys_open64_args),