Index: sys/compat/freebsd32/syscalls.master
===================================================================
--- sys/compat/freebsd32/syscalls.master
+++ sys/compat/freebsd32/syscalls.master
@@ -65,8 +65,7 @@
 ; of the current calls.
 
 0	AUE_NULL	NOPROTO	{ int nosys(void); } syscall nosys_args int
-1	AUE_EXIT	NOPROTO	{ void sys_exit(int rval); } exit \
-				    sys_exit_args void
+1	AUE_EXIT	NOPROTO	{ void exit(int rval); }
 2	AUE_FORK	NOPROTO	{ int fork(void); }
 3	AUE_READ	NOPROTO	{ ssize_t read(int fd, void *buf, \
 				    size_t nbyte); }
Index: sys/i386/ibcs2/syscalls.master
===================================================================
--- sys/i386/ibcs2/syscalls.master
+++ sys/i386/ibcs2/syscalls.master
@@ -35,8 +35,7 @@
 ; #ifdef's, etc. may be included, and are copied to the output files.
 
 0	AUE_NULL	NOPROTO	{ int nosys(void); } syscall nosys_args int
-1	AUE_EXIT	NOPROTO	{ void sys_exit(int rval); } exit \
-				    sys_exit_args void
+1	AUE_EXIT	NOPROTO	{ void exit(int rval); }
 2	AUE_FORK	NOPROTO	{ int fork(void); }
 3	AUE_NULL	STD	{ int ibcs2_read(int fd, char *buf, \
 				    u_int nbytes); }
Index: sys/kern/capabilities.conf
===================================================================
--- sys/kern/capabilities.conf
+++ sys/kern/capabilities.conf
@@ -29,7 +29,7 @@
 ## List of system calls enabled in capability mode, one name per line.
 ##
 ## Notes:
-## - sys_exit(2), abort2(2) and close(2) are very important.
+## - exit(2), abort2(2) and close(2) are very important.
 ## - Sorted alphabetically, please keep it that way.
 ##
 ## $FreeBSD$
@@ -691,9 +691,9 @@
 sync
 
 ##
-## Always allow process termination with sys_exit(2).
+## Always allow process termination with exit(2).
 ##
-sys_exit
+exit
 
 ##
 ## sysarch(2) does rather diverse things, but is required on at least i386
Index: sys/kern/kern_exit.c
===================================================================
--- sys/kern/kern_exit.c
+++ sys/kern/kern_exit.c
@@ -168,8 +168,8 @@
 /*
  * exit -- death of process.
  */
-void
-sys_sys_exit(struct thread *td, struct sys_exit_args *uap)
+int
+sys_exit(struct thread *td, struct exit_args *uap)
 {
 
 	exit1(td, uap->rval, 0);
Index: sys/kern/syscalls.master
===================================================================
--- sys/kern/syscalls.master
+++ sys/kern/syscalls.master
@@ -88,10 +88,10 @@
 		int nosys(void);
 	} syscall nosys_args int
 1	AUE_EXIT	STD {
-		void sys_exit(
+		int exit(
 		    int rval
 		);
-	} exit sys_exit_args void
+	}
 2	AUE_FORK	STD {
 		int fork(void);
 	}