diff --git a/sys/rump/include/rump/rump_syscalls.h b/sys/rump/include/rump/rump_syscalls.h
index 4912ec8e42c5..ea453400c7d2 100644
--- a/sys/rump/include/rump/rump_syscalls.h
+++ b/sys/rump/include/rump/rump_syscalls.h
@@ -1,10 +1,10 @@
-/* $NetBSD: rump_syscalls.h,v 1.37 2011/01/10 04:42:25 christos Exp $ */
+/* $NetBSD: rump_syscalls.h,v 1.38 2011/01/17 16:24:04 pooka Exp $ */
 
 /*
  * System call protos in rump namespace.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.240 2011/01/10 04:39:18 christos Exp
+ * created from	NetBSD: syscalls.master,v 1.241 2011/01/17 16:21:40 pooka Exp
  */
 
 #ifndef _RUMP_RUMP_SYSCALLS_H_
@@ -14,161 +14,764 @@
 #error Interface not supported inside kernel
 #endif /* _KERNEL */
 
-#include <sys/types.h>
-#include <sys/select.h>
+#include <sys/types.h> /* typedefs */
+#include <sys/select.h> /* typedefs */
 
-#include <signal.h>
-
-ssize_t rump_sys_read(int, void *, size_t);
-ssize_t rump_sys_write(int, const void *, size_t);
-int rump_sys_open(const char *, int, ...);
-int rump_sys_close(int);
-int rump_sys_link(const char *, const char *);
-int rump_sys_unlink(const char *);
-int rump_sys_chdir(const char *);
-int rump_sys_fchdir(int);
-int rump_sys_chmod(const char *, mode_t);
-int rump_sys_chown(const char *, uid_t, gid_t);
-pid_t rump_sys_getpid(void);
-int rump_sys_unmount(const char *, int);
-int rump_sys_setuid(uid_t);
-uid_t rump_sys_getuid(void);
-uid_t rump_sys_geteuid(void);
-ssize_t rump_sys_recvmsg(int, struct msghdr *, int);
-ssize_t rump_sys_sendmsg(int, const struct msghdr *, int);
-ssize_t rump_sys_recvfrom(int, void *, size_t, int, struct sockaddr *, unsigned int *);
-int rump_sys_accept(int, struct sockaddr *, unsigned int *);
-int rump_sys_getpeername(int, struct sockaddr *, unsigned int *);
-int rump_sys_getsockname(int, struct sockaddr *, unsigned int *);
-int rump_sys_access(const char *, int);
-int rump_sys_chflags(const char *, u_long);
-int rump_sys_fchflags(int, u_long);
-void rump_sys_sync(void);
-pid_t rump_sys_getppid(void);
-int rump_sys_dup(int);
-gid_t rump_sys_getegid(void);
-gid_t rump_sys_getgid(void);
-int rump_sys___getlogin(char *, size_t);
-int rump_sys___setlogin(const char *);
-int rump_sys_ioctl(int, u_long, ...);
-int rump_sys_revoke(const char *);
-int rump_sys_symlink(const char *, const char *);
-ssize_t rump_sys_readlink(const char *, char *, size_t);
-mode_t rump_sys_umask(mode_t);
-int rump_sys_chroot(const char *);
-int rump_sys_getgroups(int, gid_t *);
-int rump_sys_setgroups(int, const gid_t *);
-int rump_sys_getpgrp(void);
-int rump_sys_setpgid(int, int);
-int rump_sys_dup2(int, int);
-int rump_sys_fcntl(int, int, ...);
-int rump_sys_fsync(int);
-int rump_sys_connect(int, const struct sockaddr *, unsigned int);
-int rump_sys_bind(int, const struct sockaddr *, unsigned int);
-int rump_sys_setsockopt(int, int, int, const void *, unsigned int);
-int rump_sys_listen(int, int);
-int rump_sys_getsockopt(int, int, int, void *, unsigned int *);
-ssize_t rump_sys_readv(int, const struct iovec *, int);
-ssize_t rump_sys_writev(int, const struct iovec *, int);
-int rump_sys_fchown(int, uid_t, gid_t);
-int rump_sys_fchmod(int, mode_t);
-int rump_sys_setreuid(uid_t, uid_t);
-int rump_sys_setregid(gid_t, gid_t);
-int rump_sys_rename(const char *, const char *);
-int rump_sys_flock(int, int);
-int rump_sys_mkfifo(const char *, mode_t);
-ssize_t rump_sys_sendto(int, const void *, size_t, int, const struct sockaddr *, unsigned int);
-int rump_sys_shutdown(int, int);
-int rump_sys_socketpair(int, int, int, int *);
-int rump_sys_mkdir(const char *, mode_t);
-int rump_sys_rmdir(const char *);
-int rump_sys_setsid(void);
-int rump_sys_nfssvc(int, void *);
-ssize_t rump_sys_pread(int, void *, size_t, off_t);
-ssize_t rump_sys_pwrite(int, const void *, size_t, off_t);
-int rump_sys_setgid(gid_t);
-int rump_sys_setegid(gid_t);
-int rump_sys_seteuid(uid_t);
-long rump_sys_pathconf(const char *, int);
-long rump_sys_fpathconf(int, int);
-int rump_sys_getrlimit(int, struct rlimit *);
-int rump_sys_setrlimit(int, const struct rlimit *);
-off_t rump_sys_lseek(int, off_t, int);
-int rump_sys_truncate(const char *, off_t);
-int rump_sys_ftruncate(int, off_t);
-int rump_sys___sysctl(const int *, u_int, void *, size_t *, const void *, size_t);
-pid_t rump_sys_getpgid(pid_t);
-int rump_sys_reboot(int, char *);
-int rump_sys_poll(struct pollfd *, u_int, int);
-int rump_sys_fdatasync(int);
-int rump_sys_modctl(int, void *);
-int rump_sys__ksem_init(unsigned int, intptr_t *);
-int rump_sys__ksem_open(const char *, int, mode_t, unsigned int, intptr_t *);
-int rump_sys__ksem_unlink(const char *);
-int rump_sys__ksem_close(intptr_t);
-int rump_sys__ksem_post(intptr_t);
-int rump_sys__ksem_wait(intptr_t);
-int rump_sys__ksem_trywait(intptr_t);
-int rump_sys__ksem_getvalue(intptr_t, unsigned int *);
-int rump_sys__ksem_destroy(intptr_t);
-int rump_sys_lchmod(const char *, mode_t);
-int rump_sys_lchown(const char *, uid_t, gid_t);
-pid_t rump_sys_getsid(pid_t);
-int rump_sys___getcwd(char *, size_t);
-int rump_sys_fchroot(int);
-int rump_sys_lchflags(const char *, u_long);
-int rump_sys_issetugid(void);
-int rump_sys_kqueue(void);
-int rump_sys_fsync_range(int, int, off_t, off_t);
-int rump_sys_getvfsstat(struct statvfs *, size_t, int);
-int rump_sys_statvfs1(const char *, struct statvfs *, int);
-int rump_sys_fstatvfs1(int, struct statvfs *, int);
-int rump_sys_extattrctl(const char *, int, const char *, int, const char *);
-int rump_sys_extattr_set_file(const char *, int, const char *, const void *, size_t);
-ssize_t rump_sys_extattr_get_file(const char *, int, const char *, void *, size_t);
-int rump_sys_extattr_delete_file(const char *, int, const char *);
-int rump_sys_extattr_set_fd(int, int, const char *, const void *, size_t);
-ssize_t rump_sys_extattr_get_fd(int, int, const char *, void *, size_t);
-int rump_sys_extattr_delete_fd(int, int, const char *);
-int rump_sys_extattr_set_link(const char *, int, const char *, const void *, size_t);
-ssize_t rump_sys_extattr_get_link(const char *, int, const char *, void *, size_t);
-int rump_sys_extattr_delete_link(const char *, int, const char *);
-ssize_t rump_sys_extattr_list_fd(int, int, void *, size_t);
-ssize_t rump_sys_extattr_list_file(const char *, int, void *, size_t);
-ssize_t rump_sys_extattr_list_link(const char *, int, void *, size_t);
-int rump_sys_setxattr(const char *, const char *, void *, size_t, int);
-int rump_sys_lsetxattr(const char *, const char *, void *, size_t, int);
-int rump_sys_fsetxattr(int, const char *, void *, size_t, int);
-int rump_sys_getxattr(const char *, const char *, void *, size_t);
-int rump_sys_lgetxattr(const char *, const char *, void *, size_t);
-int rump_sys_fgetxattr(int, const char *, void *, size_t);
-int rump_sys_listxattr(const char *, char *, size_t);
-int rump_sys_llistxattr(const char *, char *, size_t);
-int rump_sys_flistxattr(int, char *, size_t);
-int rump_sys_removexattr(const char *, const char *);
-int rump_sys_lremovexattr(const char *, const char *);
-int rump_sys_fremovexattr(int, const char *);
-int rump_sys_getdents(int, char *, size_t) __RENAME(rump_sys___getdents30);
-int rump_sys_socket(int, int, int) __RENAME(rump_sys___socket30);
-int rump_sys_getfh(const char *, void *, size_t *) __RENAME(rump_sys___getfh30);
-int rump_sys_fhopen(const void *, size_t, int) __RENAME(rump_sys___fhopen40);
-int rump_sys_fhstatvfs1(const void *, size_t, struct statvfs *, int) __RENAME(rump_sys___fhstatvfs140);
-int rump_sys_mount(const char *, const char *, int, void *, size_t) __RENAME(rump_sys___mount50);
-int rump_sys_posix_fadvise(int, off_t, off_t, int) __RENAME(rump_sys___posix_fadvise50);
-int rump_sys_select(int, fd_set *, fd_set *, fd_set *, struct timeval *) __RENAME(rump_sys___select50);
-int rump_sys_utimes(const char *, const struct timeval *) __RENAME(rump_sys___utimes50);
-int rump_sys_futimes(int, const struct timeval *) __RENAME(rump_sys___futimes50);
-int rump_sys_lutimes(const char *, const struct timeval *) __RENAME(rump_sys___lutimes50);
-int rump_sys_kevent(int, const struct kevent *, size_t, struct kevent *, size_t, const struct timespec *) __RENAME(rump_sys___kevent50);
-int rump_sys_pselect(int, fd_set *, fd_set *, fd_set *, const struct timespec *, const sigset_t *) __RENAME(rump_sys___pselect50);
-int rump_sys_pollts(struct pollfd *, u_int, const struct timespec *, const sigset_t *) __RENAME(rump_sys___pollts50);
-int rump_sys_stat(const char *, struct stat *) __RENAME(rump_sys___stat50);
-int rump_sys_fstat(int, struct stat *) __RENAME(rump_sys___fstat50);
-int rump_sys_lstat(const char *, struct stat *) __RENAME(rump_sys___lstat50);
-int rump_sys_mknod(const char *, mode_t, dev_t) __RENAME(rump_sys___mknod50);
-int rump_sys_fhstat(const void *, size_t, struct stat *) __RENAME(rump_sys___fhstat50);
-int rump_sys_pipe(int *);
+#include <signal.h> /* typedefs */
 
 #include <rump/rump_syscalls_compat.h>
 
+#ifndef RUMP_SYS_RENAME_GETSID
+#define RUMP_SYS_RENAME_GETSID rump___sysimpl_getsid
+#endif
+
+#ifndef RUMP_SYS_RENAME_CHFLAGS
+#define RUMP_SYS_RENAME_CHFLAGS rump___sysimpl_chflags
+#endif
+
+#ifndef RUMP_SYS_RENAME_GETGROUPS
+#define RUMP_SYS_RENAME_GETGROUPS rump___sysimpl_getgroups
+#endif
+
+#ifndef RUMP_SYS_RENAME_SENDTO
+#define RUMP_SYS_RENAME_SENDTO rump___sysimpl_sendto
+#endif
+
+#ifndef RUMP_SYS_RENAME_FHSTATVFS1
+#define RUMP_SYS_RENAME_FHSTATVFS1 rump___sysimpl_fhstatvfs140
+#endif
+
+#ifndef RUMP_SYS_RENAME_EXTATTR_GET_LINK
+#define RUMP_SYS_RENAME_EXTATTR_GET_LINK rump___sysimpl_extattr_get_link
+#endif
+
+#ifndef RUMP_SYS_RENAME___GETCWD
+#define RUMP_SYS_RENAME___GETCWD rump___sysimpl___getcwd
+#endif
+
+#ifndef RUMP_SYS_RENAME_SETRLIMIT
+#define RUMP_SYS_RENAME_SETRLIMIT rump___sysimpl_setrlimit
+#endif
+
+#ifndef RUMP_SYS_RENAME_FDATASYNC
+#define RUMP_SYS_RENAME_FDATASYNC rump___sysimpl_fdatasync
+#endif
+
+#ifndef RUMP_SYS_RENAME_SETSID
+#define RUMP_SYS_RENAME_SETSID rump___sysimpl_setsid
+#endif
+
+#ifndef RUMP_SYS_RENAME_REMOVEXATTR
+#define RUMP_SYS_RENAME_REMOVEXATTR rump___sysimpl_removexattr
+#endif
+
+#ifndef RUMP_SYS_RENAME_GETVFSSTAT
+#define RUMP_SYS_RENAME_GETVFSSTAT rump___sysimpl_getvfsstat
+#endif
+
+#ifndef RUMP_SYS_RENAME_FLOCK
+#define RUMP_SYS_RENAME_FLOCK rump___sysimpl_flock
+#endif
+
+#ifndef RUMP_SYS_RENAME_LISTXATTR
+#define RUMP_SYS_RENAME_LISTXATTR rump___sysimpl_listxattr
+#endif
+
+#ifndef RUMP_SYS_RENAME_EXTATTR_GET_FD
+#define RUMP_SYS_RENAME_EXTATTR_GET_FD rump___sysimpl_extattr_get_fd
+#endif
+
+#ifndef RUMP_SYS_RENAME_GETSOCKNAME
+#define RUMP_SYS_RENAME_GETSOCKNAME rump___sysimpl_getsockname
+#endif
+
+#ifndef RUMP_SYS_RENAME_LCHOWN
+#define RUMP_SYS_RENAME_LCHOWN rump___sysimpl_lchown
+#endif
+
+#ifndef RUMP_SYS_RENAME_UNLINK
+#define RUMP_SYS_RENAME_UNLINK rump___sysimpl_unlink
+#endif
+
+#ifndef RUMP_SYS_RENAME_SETPGID
+#define RUMP_SYS_RENAME_SETPGID rump___sysimpl_setpgid
+#endif
+
+#ifndef RUMP_SYS_RENAME_FSETXATTR
+#define RUMP_SYS_RENAME_FSETXATTR rump___sysimpl_fsetxattr
+#endif
+
+#ifndef RUMP_SYS_RENAME_EXTATTR_SET_FILE
+#define RUMP_SYS_RENAME_EXTATTR_SET_FILE rump___sysimpl_extattr_set_file
+#endif
+
+#ifndef RUMP_SYS_RENAME_LSTAT
+#define RUMP_SYS_RENAME_LSTAT rump___sysimpl_lstat50
+#endif
+
+#ifndef RUMP_SYS_RENAME_EXTATTR_SET_FD
+#define RUMP_SYS_RENAME_EXTATTR_SET_FD rump___sysimpl_extattr_set_fd
+#endif
+
+#ifndef RUMP_SYS_RENAME_PATHCONF
+#define RUMP_SYS_RENAME_PATHCONF rump___sysimpl_pathconf
+#endif
+
+#ifndef RUMP_SYS_RENAME_MODCTL
+#define RUMP_SYS_RENAME_MODCTL rump___sysimpl_modctl
+#endif
+
+#ifndef RUMP_SYS_RENAME___GETLOGIN
+#define RUMP_SYS_RENAME___GETLOGIN rump___sysimpl___getlogin
+#endif
+
+#ifndef RUMP_SYS_RENAME_GETPGRP
+#define RUMP_SYS_RENAME_GETPGRP rump___sysimpl_getpgrp
+#endif
+
+#ifndef RUMP_SYS_RENAME_FCHFLAGS
+#define RUMP_SYS_RENAME_FCHFLAGS rump___sysimpl_fchflags
+#endif
+
+#ifndef RUMP_SYS_RENAME_DUP
+#define RUMP_SYS_RENAME_DUP rump___sysimpl_dup
+#endif
+
+#ifndef RUMP_SYS_RENAME_LCHMOD
+#define RUMP_SYS_RENAME_LCHMOD rump___sysimpl_lchmod
+#endif
+
+#ifndef RUMP_SYS_RENAME_GETPEERNAME
+#define RUMP_SYS_RENAME_GETPEERNAME rump___sysimpl_getpeername
+#endif
+
+#ifndef RUMP_SYS_RENAME_GETEGID
+#define RUMP_SYS_RENAME_GETEGID rump___sysimpl_getegid
+#endif
+
+#ifndef RUMP_SYS_RENAME_EXTATTR_SET_LINK
+#define RUMP_SYS_RENAME_EXTATTR_SET_LINK rump___sysimpl_extattr_set_link
+#endif
+
+#ifndef RUMP_SYS_RENAME_EXTATTR_LIST_FILE
+#define RUMP_SYS_RENAME_EXTATTR_LIST_FILE rump___sysimpl_extattr_list_file
+#endif
+
+#ifndef RUMP_SYS_RENAME__KSEM_TRYWAIT
+#define RUMP_SYS_RENAME__KSEM_TRYWAIT rump___sysimpl__ksem_trywait
+#endif
+
+#ifndef RUMP_SYS_RENAME_LINK
+#define RUMP_SYS_RENAME_LINK rump___sysimpl_link
+#endif
+
+#ifndef RUMP_SYS_RENAME_LCHFLAGS
+#define RUMP_SYS_RENAME_LCHFLAGS rump___sysimpl_lchflags
+#endif
+
+#ifndef RUMP_SYS_RENAME_DUP2
+#define RUMP_SYS_RENAME_DUP2 rump___sysimpl_dup2
+#endif
+
+#ifndef RUMP_SYS_RENAME_FHOPEN
+#define RUMP_SYS_RENAME_FHOPEN rump___sysimpl_fhopen40
+#endif
+
+#ifndef RUMP_SYS_RENAME_SELECT
+#define RUMP_SYS_RENAME_SELECT rump___sysimpl_select50
+#endif
+
+#ifndef RUMP_SYS_RENAME_EXTATTR_LIST_LINK
+#define RUMP_SYS_RENAME_EXTATTR_LIST_LINK rump___sysimpl_extattr_list_link
+#endif
+
+#ifndef RUMP_SYS_RENAME_REVOKE
+#define RUMP_SYS_RENAME_REVOKE rump___sysimpl_revoke
+#endif
+
+#ifndef RUMP_SYS_RENAME_FSTATVFS1
+#define RUMP_SYS_RENAME_FSTATVFS1 rump___sysimpl_fstatvfs1
+#endif
+
+#ifndef RUMP_SYS_RENAME_UMASK
+#define RUMP_SYS_RENAME_UMASK rump___sysimpl_umask
+#endif
+
+#ifndef RUMP_SYS_RENAME_FCNTL
+#define RUMP_SYS_RENAME_FCNTL rump___sysimpl_fcntl
+#endif
+
+#ifndef RUMP_SYS_RENAME_MKFIFO
+#define RUMP_SYS_RENAME_MKFIFO rump___sysimpl_mkfifo
+#endif
+
+#ifndef RUMP_SYS_RENAME_POLLTS
+#define RUMP_SYS_RENAME_POLLTS rump___sysimpl_pollts50
+#endif
+
+#ifndef RUMP_SYS_RENAME_OPEN
+#define RUMP_SYS_RENAME_OPEN rump___sysimpl_open
+#endif
+
+#ifndef RUMP_SYS_RENAME_ACCESS
+#define RUMP_SYS_RENAME_ACCESS rump___sysimpl_access
+#endif
+
+#ifndef RUMP_SYS_RENAME_MKNOD
+#define RUMP_SYS_RENAME_MKNOD rump___sysimpl_mknod50
+#endif
+
+#ifndef RUMP_SYS_RENAME_TRUNCATE
+#define RUMP_SYS_RENAME_TRUNCATE rump___sysimpl_truncate
+#endif
+
+#ifndef RUMP_SYS_RENAME_SETGID
+#define RUMP_SYS_RENAME_SETGID rump___sysimpl_setgid
+#endif
+
+#ifndef RUMP_SYS_RENAME_LREMOVEXATTR
+#define RUMP_SYS_RENAME_LREMOVEXATTR rump___sysimpl_lremovexattr
+#endif
+
+#ifndef RUMP_SYS_RENAME_RMDIR
+#define RUMP_SYS_RENAME_RMDIR rump___sysimpl_rmdir
+#endif
+
+#ifndef RUMP_SYS_RENAME_GETGID_WITH_EGID
+#define RUMP_SYS_RENAME_GETGID_WITH_EGID rump___sysimpl_getgid
+#endif
+
+#ifndef RUMP_SYS_RENAME_FSYNC_RANGE
+#define RUMP_SYS_RENAME_FSYNC_RANGE rump___sysimpl_fsync_range
+#endif
+
+#ifndef RUMP_SYS_RENAME_PWRITE
+#define RUMP_SYS_RENAME_PWRITE rump___sysimpl_pwrite
+#endif
+
+#ifndef RUMP_SYS_RENAME_GETRLIMIT
+#define RUMP_SYS_RENAME_GETRLIMIT rump___sysimpl_getrlimit
+#endif
+
+#ifndef RUMP_SYS_RENAME_FGETXATTR
+#define RUMP_SYS_RENAME_FGETXATTR rump___sysimpl_fgetxattr
+#endif
+
+#ifndef RUMP_SYS_RENAME_SENDMSG
+#define RUMP_SYS_RENAME_SENDMSG rump___sysimpl_sendmsg
+#endif
+
+#ifndef RUMP_SYS_RENAME__KSEM_OPEN
+#define RUMP_SYS_RENAME__KSEM_OPEN rump___sysimpl__ksem_open
+#endif
+
+#ifndef RUMP_SYS_RENAME_FLISTXATTR
+#define RUMP_SYS_RENAME_FLISTXATTR rump___sysimpl_flistxattr
+#endif
+
+#ifndef RUMP_SYS_RENAME_LUTIMES
+#define RUMP_SYS_RENAME_LUTIMES rump___sysimpl_lutimes50
+#endif
+
+#ifndef RUMP_SYS_RENAME_SHUTDOWN
+#define RUMP_SYS_RENAME_SHUTDOWN rump___sysimpl_shutdown
+#endif
+
+#ifndef RUMP_SYS_RENAME_PREAD
+#define RUMP_SYS_RENAME_PREAD rump___sysimpl_pread
+#endif
+
+#ifndef RUMP_SYS_RENAME_LISTEN
+#define RUMP_SYS_RENAME_LISTEN rump___sysimpl_listen
+#endif
+
+#ifndef RUMP_SYS_RENAME_MKDIR
+#define RUMP_SYS_RENAME_MKDIR rump___sysimpl_mkdir
+#endif
+
+#ifndef RUMP_SYS_RENAME_GETFH
+#define RUMP_SYS_RENAME_GETFH rump___sysimpl_getfh30
+#endif
+
+#ifndef RUMP_SYS_RENAME_GETEUID
+#define RUMP_SYS_RENAME_GETEUID rump___sysimpl_geteuid
+#endif
+
+#ifndef RUMP_SYS_RENAME_FSYNC
+#define RUMP_SYS_RENAME_FSYNC rump___sysimpl_fsync
+#endif
+
+#ifndef RUMP_SYS_RENAME_EXTATTR_DELETE_FILE
+#define RUMP_SYS_RENAME_EXTATTR_DELETE_FILE rump___sysimpl_extattr_delete_file
+#endif
+
+#ifndef RUMP_SYS_RENAME_ISSETUGID
+#define RUMP_SYS_RENAME_ISSETUGID rump___sysimpl_issetugid
+#endif
+
+#ifndef RUMP_SYS_RENAME_LGETXATTR
+#define RUMP_SYS_RENAME_LGETXATTR rump___sysimpl_lgetxattr
+#endif
+
+#ifndef RUMP_SYS_RENAME_KEVENT
+#define RUMP_SYS_RENAME_KEVENT rump___sysimpl_kevent50
+#endif
+
+#ifndef RUMP_SYS_RENAME_POSIX_FADVISE
+#define RUMP_SYS_RENAME_POSIX_FADVISE rump___sysimpl_posix_fadvise50
+#endif
+
+#ifndef RUMP_SYS_RENAME_FSTAT
+#define RUMP_SYS_RENAME_FSTAT rump___sysimpl_fstat50
+#endif
+
+#ifndef RUMP_SYS_RENAME__KSEM_DESTROY
+#define RUMP_SYS_RENAME__KSEM_DESTROY rump___sysimpl__ksem_destroy
+#endif
+
+#ifndef RUMP_SYS_RENAME_CHDIR
+#define RUMP_SYS_RENAME_CHDIR rump___sysimpl_chdir
+#endif
+
+#ifndef RUMP_SYS_RENAME_EXTATTR_DELETE_LINK
+#define RUMP_SYS_RENAME_EXTATTR_DELETE_LINK rump___sysimpl_extattr_delete_link
+#endif
+
+#ifndef RUMP_SYS_RENAME_CHOWN
+#define RUMP_SYS_RENAME_CHOWN rump___sysimpl_chown
+#endif
+
+#ifndef RUMP_SYS_RENAME_FCHDIR
+#define RUMP_SYS_RENAME_FCHDIR rump___sysimpl_fchdir
+#endif
+
+#ifndef RUMP_SYS_RENAME_RECVMSG
+#define RUMP_SYS_RENAME_RECVMSG rump___sysimpl_recvmsg
+#endif
+
+#ifndef RUMP_SYS_RENAME_FCHOWN
+#define RUMP_SYS_RENAME_FCHOWN rump___sysimpl_fchown
+#endif
+
+#ifndef RUMP_SYS_RENAME_SETREGID
+#define RUMP_SYS_RENAME_SETREGID rump___sysimpl_setregid
+#endif
+
+#ifndef RUMP_SYS_RENAME_POLL
+#define RUMP_SYS_RENAME_POLL rump___sysimpl_poll
+#endif
+
+#ifndef RUMP_SYS_RENAME_READV
+#define RUMP_SYS_RENAME_READV rump___sysimpl_readv
+#endif
+
+#ifndef RUMP_SYS_RENAME_SYMLINK
+#define RUMP_SYS_RENAME_SYMLINK rump___sysimpl_symlink
+#endif
+
+#ifndef RUMP_SYS_RENAME_PSELECT
+#define RUMP_SYS_RENAME_PSELECT rump___sysimpl_pselect50
+#endif
+
+#ifndef RUMP_SYS_RENAME_SETGROUPS
+#define RUMP_SYS_RENAME_SETGROUPS rump___sysimpl_setgroups
+#endif
+
+#ifndef RUMP_SYS_RENAME_SETXATTR
+#define RUMP_SYS_RENAME_SETXATTR rump___sysimpl_setxattr
+#endif
+
+#ifndef RUMP_SYS_RENAME_SETEGID
+#define RUMP_SYS_RENAME_SETEGID rump___sysimpl_setegid
+#endif
+
+#ifndef RUMP_SYS_RENAME_GETSOCKOPT
+#define RUMP_SYS_RENAME_GETSOCKOPT rump___sysimpl_getsockopt
+#endif
+
+#ifndef RUMP_SYS_RENAME_CONNECT
+#define RUMP_SYS_RENAME_CONNECT rump___sysimpl_connect
+#endif
+
+#ifndef RUMP_SYS_RENAME_LSEEK
+#define RUMP_SYS_RENAME_LSEEK rump___sysimpl_lseek
+#endif
+
+#ifndef RUMP_SYS_RENAME_EXTATTR_DELETE_FD
+#define RUMP_SYS_RENAME_EXTATTR_DELETE_FD rump___sysimpl_extattr_delete_fd
+#endif
+
+#ifndef RUMP_SYS_RENAME_CHMOD
+#define RUMP_SYS_RENAME_CHMOD rump___sysimpl_chmod
+#endif
+
+#ifndef RUMP_SYS_RENAME_BIND
+#define RUMP_SYS_RENAME_BIND rump___sysimpl_bind
+#endif
+
+#ifndef RUMP_SYS_RENAME__KSEM_WAIT
+#define RUMP_SYS_RENAME__KSEM_WAIT rump___sysimpl__ksem_wait
+#endif
+
+#ifndef RUMP_SYS_RENAME_SETUID
+#define RUMP_SYS_RENAME_SETUID rump___sysimpl_setuid
+#endif
+
+#ifndef RUMP_SYS_RENAME_GETUID_WITH_EUID
+#define RUMP_SYS_RENAME_GETUID_WITH_EUID rump___sysimpl_getuid
+#endif
+
+#ifndef RUMP_SYS_RENAME_CHROOT
+#define RUMP_SYS_RENAME_CHROOT rump___sysimpl_chroot
+#endif
+
+#ifndef RUMP_SYS_RENAME_FCHMOD
+#define RUMP_SYS_RENAME_FCHMOD rump___sysimpl_fchmod
+#endif
+
+#ifndef RUMP_SYS_RENAME_FPATHCONF
+#define RUMP_SYS_RENAME_FPATHCONF rump___sysimpl_fpathconf
+#endif
+
+#ifndef RUMP_SYS_RENAME_UNMOUNT
+#define RUMP_SYS_RENAME_UNMOUNT rump___sysimpl_unmount
+#endif
+
+#ifndef RUMP_SYS_RENAME_READLINK
+#define RUMP_SYS_RENAME_READLINK rump___sysimpl_readlink
+#endif
+
+#ifndef RUMP_SYS_RENAME_LSETXATTR
+#define RUMP_SYS_RENAME_LSETXATTR rump___sysimpl_lsetxattr
+#endif
+
+#ifndef RUMP_SYS_RENAME__KSEM_GETVALUE
+#define RUMP_SYS_RENAME__KSEM_GETVALUE rump___sysimpl__ksem_getvalue
+#endif
+
+#ifndef RUMP_SYS_RENAME_READ
+#define RUMP_SYS_RENAME_READ rump___sysimpl_read
+#endif
+
+#ifndef RUMP_SYS_RENAME_RENAME
+#define RUMP_SYS_RENAME_RENAME rump___sysimpl_rename
+#endif
+
+#ifndef RUMP_SYS_RENAME_WRITEV
+#define RUMP_SYS_RENAME_WRITEV rump___sysimpl_writev
+#endif
+
+#ifndef RUMP_SYS_RENAME_CLOSE
+#define RUMP_SYS_RENAME_CLOSE rump___sysimpl_close
+#endif
+
+#ifndef RUMP_SYS_RENAME_GETPGID
+#define RUMP_SYS_RENAME_GETPGID rump___sysimpl_getpgid
+#endif
+
+#ifndef RUMP_SYS_RENAME_IOCTL
+#define RUMP_SYS_RENAME_IOCTL rump___sysimpl_ioctl
+#endif
+
+#ifndef RUMP_SYS_RENAME_FHSTAT
+#define RUMP_SYS_RENAME_FHSTAT rump___sysimpl_fhstat50
+#endif
+
+#ifndef RUMP_SYS_RENAME_RECVFROM
+#define RUMP_SYS_RENAME_RECVFROM rump___sysimpl_recvfrom
+#endif
+
+#ifndef RUMP_SYS_RENAME__KSEM_INIT
+#define RUMP_SYS_RENAME__KSEM_INIT rump___sysimpl__ksem_init
+#endif
+
+#ifndef RUMP_SYS_RENAME__KSEM_CLOSE
+#define RUMP_SYS_RENAME__KSEM_CLOSE rump___sysimpl__ksem_close
+#endif
+
+#ifndef RUMP_SYS_RENAME_MOUNT
+#define RUMP_SYS_RENAME_MOUNT rump___sysimpl_mount50
+#endif
+
+#ifndef RUMP_SYS_RENAME_UTIMES
+#define RUMP_SYS_RENAME_UTIMES rump___sysimpl_utimes50
+#endif
+
+#ifndef RUMP_SYS_RENAME_SYNC
+#define RUMP_SYS_RENAME_SYNC rump___sysimpl_sync
+#endif
+
+#ifndef RUMP_SYS_RENAME_LLISTXATTR
+#define RUMP_SYS_RENAME_LLISTXATTR rump___sysimpl_llistxattr
+#endif
+
+#ifndef RUMP_SYS_RENAME__KSEM_POST
+#define RUMP_SYS_RENAME__KSEM_POST rump___sysimpl__ksem_post
+#endif
+
+#ifndef RUMP_SYS_RENAME_STATVFS1
+#define RUMP_SYS_RENAME_STATVFS1 rump___sysimpl_statvfs1
+#endif
+
+#ifndef RUMP_SYS_RENAME_STAT
+#define RUMP_SYS_RENAME_STAT rump___sysimpl_stat50
+#endif
+
+#ifndef RUMP_SYS_RENAME_SETSOCKOPT
+#define RUMP_SYS_RENAME_SETSOCKOPT rump___sysimpl_setsockopt
+#endif
+
+#ifndef RUMP_SYS_RENAME_GETDENTS
+#define RUMP_SYS_RENAME_GETDENTS rump___sysimpl_getdents30
+#endif
+
+#ifndef RUMP_SYS_RENAME_KQUEUE
+#define RUMP_SYS_RENAME_KQUEUE rump___sysimpl_kqueue
+#endif
+
+#ifndef RUMP_SYS_RENAME___SYSCTL
+#define RUMP_SYS_RENAME___SYSCTL rump___sysimpl___sysctl
+#endif
+
+#ifndef RUMP_SYS_RENAME_FREMOVEXATTR
+#define RUMP_SYS_RENAME_FREMOVEXATTR rump___sysimpl_fremovexattr
+#endif
+
+#ifndef RUMP_SYS_RENAME_EXTATTRCTL
+#define RUMP_SYS_RENAME_EXTATTRCTL rump___sysimpl_extattrctl
+#endif
+
+#ifndef RUMP_SYS_RENAME_GETPID_WITH_PPID
+#define RUMP_SYS_RENAME_GETPID_WITH_PPID rump___sysimpl_getpid
+#endif
+
+#ifndef RUMP_SYS_RENAME_SETREUID
+#define RUMP_SYS_RENAME_SETREUID rump___sysimpl_setreuid
+#endif
+
+#ifndef RUMP_SYS_RENAME_SOCKETPAIR
+#define RUMP_SYS_RENAME_SOCKETPAIR rump___sysimpl_socketpair
+#endif
+
+#ifndef RUMP_SYS_RENAME_WRITE
+#define RUMP_SYS_RENAME_WRITE rump___sysimpl_write
+#endif
+
+#ifndef RUMP_SYS_RENAME___SETLOGIN
+#define RUMP_SYS_RENAME___SETLOGIN rump___sysimpl___setlogin
+#endif
+
+#ifndef RUMP_SYS_RENAME_SOCKET
+#define RUMP_SYS_RENAME_SOCKET rump___sysimpl_socket30
+#endif
+
+#ifndef RUMP_SYS_RENAME_FTRUNCATE
+#define RUMP_SYS_RENAME_FTRUNCATE rump___sysimpl_ftruncate
+#endif
+
+#ifndef RUMP_SYS_RENAME_FCHROOT
+#define RUMP_SYS_RENAME_FCHROOT rump___sysimpl_fchroot
+#endif
+
+#ifndef RUMP_SYS_RENAME_SETEUID
+#define RUMP_SYS_RENAME_SETEUID rump___sysimpl_seteuid
+#endif
+
+#ifndef RUMP_SYS_RENAME_REBOOT
+#define RUMP_SYS_RENAME_REBOOT rump___sysimpl_reboot
+#endif
+
+#ifndef RUMP_SYS_RENAME_ACCEPT
+#define RUMP_SYS_RENAME_ACCEPT rump___sysimpl_accept
+#endif
+
+#ifndef RUMP_SYS_RENAME_GETXATTR
+#define RUMP_SYS_RENAME_GETXATTR rump___sysimpl_getxattr
+#endif
+
+#ifndef RUMP_SYS_RENAME__KSEM_UNLINK
+#define RUMP_SYS_RENAME__KSEM_UNLINK rump___sysimpl__ksem_unlink
+#endif
+
+#ifndef RUMP_SYS_RENAME_NFSSVC
+#define RUMP_SYS_RENAME_NFSSVC rump___sysimpl_nfssvc
+#endif
+
+#ifndef RUMP_SYS_RENAME_GETPPID
+#define RUMP_SYS_RENAME_GETPPID rump___sysimpl_getppid
+#endif
+
+#ifndef RUMP_SYS_RENAME_EXTATTR_LIST_FD
+#define RUMP_SYS_RENAME_EXTATTR_LIST_FD rump___sysimpl_extattr_list_fd
+#endif
+
+#ifndef RUMP_SYS_RENAME_EXTATTR_GET_FILE
+#define RUMP_SYS_RENAME_EXTATTR_GET_FILE rump___sysimpl_extattr_get_file
+#endif
+
+#ifndef RUMP_SYS_RENAME_FUTIMES
+#define RUMP_SYS_RENAME_FUTIMES rump___sysimpl_futimes50
+#endif
+
+struct msghdr;
+struct sockaddr;
+struct timeval;
+struct iovec;
+struct rlimit;
+struct pollfd;
+struct kevent;
+struct timespec;
+struct statvfs;
+struct stat;
+
+ssize_t rump_sys_read(int, void *, size_t) __RENAME(RUMP_SYS_RENAME_READ);
+ssize_t rump_sys_write(int, const void *, size_t) __RENAME(RUMP_SYS_RENAME_WRITE);
+int rump_sys_open(const char *, int, ...) __RENAME(RUMP_SYS_RENAME_OPEN);
+int rump_sys_close(int) __RENAME(RUMP_SYS_RENAME_CLOSE);
+int rump_sys_link(const char *, const char *) __RENAME(RUMP_SYS_RENAME_LINK);
+int rump_sys_unlink(const char *) __RENAME(RUMP_SYS_RENAME_UNLINK);
+int rump_sys_chdir(const char *) __RENAME(RUMP_SYS_RENAME_CHDIR);
+int rump_sys_fchdir(int) __RENAME(RUMP_SYS_RENAME_FCHDIR);
+int rump_sys_chmod(const char *, mode_t) __RENAME(RUMP_SYS_RENAME_CHMOD);
+int rump_sys_chown(const char *, uid_t, gid_t) __RENAME(RUMP_SYS_RENAME_CHOWN);
+pid_t rump_sys_getpid(void) __RENAME(RUMP_SYS_RENAME_GETPID_WITH_PPID);
+int rump_sys_unmount(const char *, int) __RENAME(RUMP_SYS_RENAME_UNMOUNT);
+int rump_sys_setuid(uid_t) __RENAME(RUMP_SYS_RENAME_SETUID);
+uid_t rump_sys_getuid(void) __RENAME(RUMP_SYS_RENAME_GETUID_WITH_EUID);
+uid_t rump_sys_geteuid(void) __RENAME(RUMP_SYS_RENAME_GETEUID);
+ssize_t rump_sys_recvmsg(int, struct msghdr *, int) __RENAME(RUMP_SYS_RENAME_RECVMSG);
+ssize_t rump_sys_sendmsg(int, const struct msghdr *, int) __RENAME(RUMP_SYS_RENAME_SENDMSG);
+ssize_t rump_sys_recvfrom(int, void *, size_t, int, struct sockaddr *, unsigned int *) __RENAME(RUMP_SYS_RENAME_RECVFROM);
+int rump_sys_accept(int, struct sockaddr *, unsigned int *) __RENAME(RUMP_SYS_RENAME_ACCEPT);
+int rump_sys_getpeername(int, struct sockaddr *, unsigned int *) __RENAME(RUMP_SYS_RENAME_GETPEERNAME);
+int rump_sys_getsockname(int, struct sockaddr *, unsigned int *) __RENAME(RUMP_SYS_RENAME_GETSOCKNAME);
+int rump_sys_access(const char *, int) __RENAME(RUMP_SYS_RENAME_ACCESS);
+int rump_sys_chflags(const char *, u_long) __RENAME(RUMP_SYS_RENAME_CHFLAGS);
+int rump_sys_fchflags(int, u_long) __RENAME(RUMP_SYS_RENAME_FCHFLAGS);
+void rump_sys_sync(void) __RENAME(RUMP_SYS_RENAME_SYNC);
+pid_t rump_sys_getppid(void) __RENAME(RUMP_SYS_RENAME_GETPPID);
+int rump_sys_dup(int) __RENAME(RUMP_SYS_RENAME_DUP);
+gid_t rump_sys_getegid(void) __RENAME(RUMP_SYS_RENAME_GETEGID);
+gid_t rump_sys_getgid(void) __RENAME(RUMP_SYS_RENAME_GETGID_WITH_EGID);
+int rump_sys___getlogin(char *, size_t) __RENAME(RUMP_SYS_RENAME___GETLOGIN);
+int rump_sys___setlogin(const char *) __RENAME(RUMP_SYS_RENAME___SETLOGIN);
+int rump_sys_ioctl(int, u_long, ...) __RENAME(RUMP_SYS_RENAME_IOCTL);
+int rump_sys_revoke(const char *) __RENAME(RUMP_SYS_RENAME_REVOKE);
+int rump_sys_symlink(const char *, const char *) __RENAME(RUMP_SYS_RENAME_SYMLINK);
+ssize_t rump_sys_readlink(const char *, char *, size_t) __RENAME(RUMP_SYS_RENAME_READLINK);
+mode_t rump_sys_umask(mode_t) __RENAME(RUMP_SYS_RENAME_UMASK);
+int rump_sys_chroot(const char *) __RENAME(RUMP_SYS_RENAME_CHROOT);
+int rump_sys_getgroups(int, gid_t *) __RENAME(RUMP_SYS_RENAME_GETGROUPS);
+int rump_sys_setgroups(int, const gid_t *) __RENAME(RUMP_SYS_RENAME_SETGROUPS);
+int rump_sys_getpgrp(void) __RENAME(RUMP_SYS_RENAME_GETPGRP);
+int rump_sys_setpgid(int, int) __RENAME(RUMP_SYS_RENAME_SETPGID);
+int rump_sys_dup2(int, int) __RENAME(RUMP_SYS_RENAME_DUP2);
+int rump_sys_fcntl(int, int, ...) __RENAME(RUMP_SYS_RENAME_FCNTL);
+int rump_sys_select(int, fd_set *, fd_set *, fd_set *, struct timeval *) __RENAME(RUMP_SYS_RENAME_SELECT);
+int rump_sys_fsync(int) __RENAME(RUMP_SYS_RENAME_FSYNC);
+int rump_sys_connect(int, const struct sockaddr *, unsigned int) __RENAME(RUMP_SYS_RENAME_CONNECT);
+int rump_sys_bind(int, const struct sockaddr *, unsigned int) __RENAME(RUMP_SYS_RENAME_BIND);
+int rump_sys_setsockopt(int, int, int, const void *, unsigned int) __RENAME(RUMP_SYS_RENAME_SETSOCKOPT);
+int rump_sys_listen(int, int) __RENAME(RUMP_SYS_RENAME_LISTEN);
+int rump_sys_getsockopt(int, int, int, void *, unsigned int *) __RENAME(RUMP_SYS_RENAME_GETSOCKOPT);
+ssize_t rump_sys_readv(int, const struct iovec *, int) __RENAME(RUMP_SYS_RENAME_READV);
+ssize_t rump_sys_writev(int, const struct iovec *, int) __RENAME(RUMP_SYS_RENAME_WRITEV);
+int rump_sys_fchown(int, uid_t, gid_t) __RENAME(RUMP_SYS_RENAME_FCHOWN);
+int rump_sys_fchmod(int, mode_t) __RENAME(RUMP_SYS_RENAME_FCHMOD);
+int rump_sys_setreuid(uid_t, uid_t) __RENAME(RUMP_SYS_RENAME_SETREUID);
+int rump_sys_setregid(gid_t, gid_t) __RENAME(RUMP_SYS_RENAME_SETREGID);
+int rump_sys_rename(const char *, const char *) __RENAME(RUMP_SYS_RENAME_RENAME);
+int rump_sys_flock(int, int) __RENAME(RUMP_SYS_RENAME_FLOCK);
+int rump_sys_mkfifo(const char *, mode_t) __RENAME(RUMP_SYS_RENAME_MKFIFO);
+ssize_t rump_sys_sendto(int, const void *, size_t, int, const struct sockaddr *, unsigned int) __RENAME(RUMP_SYS_RENAME_SENDTO);
+int rump_sys_shutdown(int, int) __RENAME(RUMP_SYS_RENAME_SHUTDOWN);
+int rump_sys_socketpair(int, int, int, int *) __RENAME(RUMP_SYS_RENAME_SOCKETPAIR);
+int rump_sys_mkdir(const char *, mode_t) __RENAME(RUMP_SYS_RENAME_MKDIR);
+int rump_sys_rmdir(const char *) __RENAME(RUMP_SYS_RENAME_RMDIR);
+int rump_sys_utimes(const char *, const struct timeval *) __RENAME(RUMP_SYS_RENAME_UTIMES);
+int rump_sys_setsid(void) __RENAME(RUMP_SYS_RENAME_SETSID);
+int rump_sys_nfssvc(int, void *) __RENAME(RUMP_SYS_RENAME_NFSSVC);
+ssize_t rump_sys_pread(int, void *, size_t, off_t) __RENAME(RUMP_SYS_RENAME_PREAD);
+ssize_t rump_sys_pwrite(int, const void *, size_t, off_t) __RENAME(RUMP_SYS_RENAME_PWRITE);
+int rump_sys_setgid(gid_t) __RENAME(RUMP_SYS_RENAME_SETGID);
+int rump_sys_setegid(gid_t) __RENAME(RUMP_SYS_RENAME_SETEGID);
+int rump_sys_seteuid(uid_t) __RENAME(RUMP_SYS_RENAME_SETEUID);
+long rump_sys_pathconf(const char *, int) __RENAME(RUMP_SYS_RENAME_PATHCONF);
+long rump_sys_fpathconf(int, int) __RENAME(RUMP_SYS_RENAME_FPATHCONF);
+int rump_sys_getrlimit(int, struct rlimit *) __RENAME(RUMP_SYS_RENAME_GETRLIMIT);
+int rump_sys_setrlimit(int, const struct rlimit *) __RENAME(RUMP_SYS_RENAME_SETRLIMIT);
+off_t rump_sys_lseek(int, off_t, int) __RENAME(RUMP_SYS_RENAME_LSEEK);
+int rump_sys_truncate(const char *, off_t) __RENAME(RUMP_SYS_RENAME_TRUNCATE);
+int rump_sys_ftruncate(int, off_t) __RENAME(RUMP_SYS_RENAME_FTRUNCATE);
+int rump_sys___sysctl(const int *, u_int, void *, size_t *, const void *, size_t) __RENAME(RUMP_SYS_RENAME___SYSCTL);
+int rump_sys_futimes(int, const struct timeval *) __RENAME(RUMP_SYS_RENAME_FUTIMES);
+pid_t rump_sys_getpgid(pid_t) __RENAME(RUMP_SYS_RENAME_GETPGID);
+int rump_sys_reboot(int, char *) __RENAME(RUMP_SYS_RENAME_REBOOT);
+int rump_sys_poll(struct pollfd *, u_int, int) __RENAME(RUMP_SYS_RENAME_POLL);
+int rump_sys_fdatasync(int) __RENAME(RUMP_SYS_RENAME_FDATASYNC);
+int rump_sys_modctl(int, void *) __RENAME(RUMP_SYS_RENAME_MODCTL);
+int rump_sys__ksem_init(unsigned int, intptr_t *) __RENAME(RUMP_SYS_RENAME__KSEM_INIT);
+int rump_sys__ksem_open(const char *, int, mode_t, unsigned int, intptr_t *) __RENAME(RUMP_SYS_RENAME__KSEM_OPEN);
+int rump_sys__ksem_unlink(const char *) __RENAME(RUMP_SYS_RENAME__KSEM_UNLINK);
+int rump_sys__ksem_close(intptr_t) __RENAME(RUMP_SYS_RENAME__KSEM_CLOSE);
+int rump_sys__ksem_post(intptr_t) __RENAME(RUMP_SYS_RENAME__KSEM_POST);
+int rump_sys__ksem_wait(intptr_t) __RENAME(RUMP_SYS_RENAME__KSEM_WAIT);
+int rump_sys__ksem_trywait(intptr_t) __RENAME(RUMP_SYS_RENAME__KSEM_TRYWAIT);
+int rump_sys__ksem_getvalue(intptr_t, unsigned int *) __RENAME(RUMP_SYS_RENAME__KSEM_GETVALUE);
+int rump_sys__ksem_destroy(intptr_t) __RENAME(RUMP_SYS_RENAME__KSEM_DESTROY);
+int rump_sys_lchmod(const char *, mode_t) __RENAME(RUMP_SYS_RENAME_LCHMOD);
+int rump_sys_lchown(const char *, uid_t, gid_t) __RENAME(RUMP_SYS_RENAME_LCHOWN);
+int rump_sys_lutimes(const char *, const struct timeval *) __RENAME(RUMP_SYS_RENAME_LUTIMES);
+pid_t rump_sys_getsid(pid_t) __RENAME(RUMP_SYS_RENAME_GETSID);
+int rump_sys___getcwd(char *, size_t) __RENAME(RUMP_SYS_RENAME___GETCWD);
+int rump_sys_fchroot(int) __RENAME(RUMP_SYS_RENAME_FCHROOT);
+int rump_sys_lchflags(const char *, u_long) __RENAME(RUMP_SYS_RENAME_LCHFLAGS);
+int rump_sys_issetugid(void) __RENAME(RUMP_SYS_RENAME_ISSETUGID);
+int rump_sys_kqueue(void) __RENAME(RUMP_SYS_RENAME_KQUEUE);
+int rump_sys_kevent(int, const struct kevent *, size_t, struct kevent *, size_t, const struct timespec *) __RENAME(RUMP_SYS_RENAME_KEVENT);
+int rump_sys_fsync_range(int, int, off_t, off_t) __RENAME(RUMP_SYS_RENAME_FSYNC_RANGE);
+int rump_sys_getvfsstat(struct statvfs *, size_t, int) __RENAME(RUMP_SYS_RENAME_GETVFSSTAT);
+int rump_sys_statvfs1(const char *, struct statvfs *, int) __RENAME(RUMP_SYS_RENAME_STATVFS1);
+int rump_sys_fstatvfs1(int, struct statvfs *, int) __RENAME(RUMP_SYS_RENAME_FSTATVFS1);
+int rump_sys_extattrctl(const char *, int, const char *, int, const char *) __RENAME(RUMP_SYS_RENAME_EXTATTRCTL);
+int rump_sys_extattr_set_file(const char *, int, const char *, const void *, size_t) __RENAME(RUMP_SYS_RENAME_EXTATTR_SET_FILE);
+ssize_t rump_sys_extattr_get_file(const char *, int, const char *, void *, size_t) __RENAME(RUMP_SYS_RENAME_EXTATTR_GET_FILE);
+int rump_sys_extattr_delete_file(const char *, int, const char *) __RENAME(RUMP_SYS_RENAME_EXTATTR_DELETE_FILE);
+int rump_sys_extattr_set_fd(int, int, const char *, const void *, size_t) __RENAME(RUMP_SYS_RENAME_EXTATTR_SET_FD);
+ssize_t rump_sys_extattr_get_fd(int, int, const char *, void *, size_t) __RENAME(RUMP_SYS_RENAME_EXTATTR_GET_FD);
+int rump_sys_extattr_delete_fd(int, int, const char *) __RENAME(RUMP_SYS_RENAME_EXTATTR_DELETE_FD);
+int rump_sys_extattr_set_link(const char *, int, const char *, const void *, size_t) __RENAME(RUMP_SYS_RENAME_EXTATTR_SET_LINK);
+ssize_t rump_sys_extattr_get_link(const char *, int, const char *, void *, size_t) __RENAME(RUMP_SYS_RENAME_EXTATTR_GET_LINK);
+int rump_sys_extattr_delete_link(const char *, int, const char *) __RENAME(RUMP_SYS_RENAME_EXTATTR_DELETE_LINK);
+ssize_t rump_sys_extattr_list_fd(int, int, void *, size_t) __RENAME(RUMP_SYS_RENAME_EXTATTR_LIST_FD);
+ssize_t rump_sys_extattr_list_file(const char *, int, void *, size_t) __RENAME(RUMP_SYS_RENAME_EXTATTR_LIST_FILE);
+ssize_t rump_sys_extattr_list_link(const char *, int, void *, size_t) __RENAME(RUMP_SYS_RENAME_EXTATTR_LIST_LINK);
+int rump_sys_pollts(struct pollfd *, u_int, const struct timespec *, const sigset_t *) __RENAME(RUMP_SYS_RENAME_POLLTS);
+int rump_sys_setxattr(const char *, const char *, void *, size_t, int) __RENAME(RUMP_SYS_RENAME_SETXATTR);
+int rump_sys_lsetxattr(const char *, const char *, void *, size_t, int) __RENAME(RUMP_SYS_RENAME_LSETXATTR);
+int rump_sys_fsetxattr(int, const char *, void *, size_t, int) __RENAME(RUMP_SYS_RENAME_FSETXATTR);
+int rump_sys_getxattr(const char *, const char *, void *, size_t) __RENAME(RUMP_SYS_RENAME_GETXATTR);
+int rump_sys_lgetxattr(const char *, const char *, void *, size_t) __RENAME(RUMP_SYS_RENAME_LGETXATTR);
+int rump_sys_fgetxattr(int, const char *, void *, size_t) __RENAME(RUMP_SYS_RENAME_FGETXATTR);
+int rump_sys_listxattr(const char *, char *, size_t) __RENAME(RUMP_SYS_RENAME_LISTXATTR);
+int rump_sys_llistxattr(const char *, char *, size_t) __RENAME(RUMP_SYS_RENAME_LLISTXATTR);
+int rump_sys_flistxattr(int, char *, size_t) __RENAME(RUMP_SYS_RENAME_FLISTXATTR);
+int rump_sys_removexattr(const char *, const char *) __RENAME(RUMP_SYS_RENAME_REMOVEXATTR);
+int rump_sys_lremovexattr(const char *, const char *) __RENAME(RUMP_SYS_RENAME_LREMOVEXATTR);
+int rump_sys_fremovexattr(int, const char *) __RENAME(RUMP_SYS_RENAME_FREMOVEXATTR);
+int rump_sys_stat(const char *, struct stat *) __RENAME(RUMP_SYS_RENAME_STAT);
+int rump_sys_fstat(int, struct stat *) __RENAME(RUMP_SYS_RENAME_FSTAT);
+int rump_sys_lstat(const char *, struct stat *) __RENAME(RUMP_SYS_RENAME_LSTAT);
+int rump_sys_getdents(int, char *, size_t) __RENAME(RUMP_SYS_RENAME_GETDENTS);
+int rump_sys_socket(int, int, int) __RENAME(RUMP_SYS_RENAME_SOCKET);
+int rump_sys_getfh(const char *, void *, size_t *) __RENAME(RUMP_SYS_RENAME_GETFH);
+int rump_sys_fhopen(const void *, size_t, int) __RENAME(RUMP_SYS_RENAME_FHOPEN);
+int rump_sys_fhstatvfs1(const void *, size_t, struct statvfs *, int) __RENAME(RUMP_SYS_RENAME_FHSTATVFS1);
+int rump_sys_mount(const char *, const char *, int, void *, size_t) __RENAME(RUMP_SYS_RENAME_MOUNT);
+int rump_sys_posix_fadvise(int, off_t, off_t, int) __RENAME(RUMP_SYS_RENAME_POSIX_FADVISE);
+int rump_sys_pselect(int, fd_set *, fd_set *, fd_set *, const struct timespec *, const sigset_t *) __RENAME(RUMP_SYS_RENAME_PSELECT);
+int rump_sys_mknod(const char *, mode_t, dev_t) __RENAME(RUMP_SYS_RENAME_MKNOD);
+int rump_sys_fhstat(const void *, size_t, struct stat *) __RENAME(RUMP_SYS_RENAME_FHSTAT);
+int rump_sys_pipe(int *);
+
 #endif /* _RUMP_RUMP_SYSCALLS_H_ */
diff --git a/sys/rump/librump/rumpkern/rump_syscalls.c b/sys/rump/librump/rumpkern/rump_syscalls.c
index c56f4a09ec10..1301def076ce 100644
--- a/sys/rump/librump/rumpkern/rump_syscalls.c
+++ b/sys/rump/librump/rumpkern/rump_syscalls.c
@@ -1,14 +1,14 @@
-/* $NetBSD: rump_syscalls.c,v 1.59 2011/01/10 04:42:25 christos Exp $ */
+/* $NetBSD: rump_syscalls.c,v 1.60 2011/01/17 16:24:04 pooka Exp $ */
 
 /*
  * System call vector and marshalling for rump.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.240 2011/01/10 04:39:18 christos Exp
+ * created from	NetBSD: syscalls.master,v 1.241 2011/01/17 16:21:40 pooka Exp
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.59 2011/01/10 04:42:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.60 2011/01/17 16:24:04 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/fstypes.h>
@@ -65,9 +65,9 @@ rump_enosys()
 }
 #endif
 
-ssize_t rump_sys_read(int, void *, size_t);
+ssize_t rump___sysimpl_read(int, void *, size_t);
 ssize_t
-rump_sys_read(int fd, void * buf, size_t nbyte)
+rump___sysimpl_read(int fd, void * buf, size_t nbyte)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -86,9 +86,9 @@ rump_sys_read(int fd, void * buf, size_t nbyte)
 }
 rsys_alias(sys_read,rump_enosys)
 
-ssize_t rump_sys_write(int, const void *, size_t);
+ssize_t rump___sysimpl_write(int, const void *, size_t);
 ssize_t
-rump_sys_write(int fd, const void * buf, size_t nbyte)
+rump___sysimpl_write(int fd, const void * buf, size_t nbyte)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -107,9 +107,9 @@ rump_sys_write(int fd, const void * buf, size_t nbyte)
 }
 rsys_alias(sys_write,rump_enosys)
 
-int rump_sys_open(const char *, int, mode_t);
+int rump___sysimpl_open(const char *, int, mode_t);
 int
-rump_sys_open(const char * path, int flags, mode_t mode)
+rump___sysimpl_open(const char * path, int flags, mode_t mode)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -128,9 +128,9 @@ rump_sys_open(const char * path, int flags, mode_t mode)
 }
 rsys_alias(sys_open,rump_enosys)
 
-int rump_sys_close(int);
+int rump___sysimpl_close(int);
 int
-rump_sys_close(int fd)
+rump___sysimpl_close(int fd)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -147,9 +147,9 @@ rump_sys_close(int fd)
 }
 rsys_alias(sys_close,rump_enosys)
 
-int rump_sys_link(const char *, const char *);
+int rump___sysimpl_link(const char *, const char *);
 int
-rump_sys_link(const char * path, const char * link)
+rump___sysimpl_link(const char * path, const char * link)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -167,9 +167,9 @@ rump_sys_link(const char * path, const char * link)
 }
 rsys_alias(sys_link,rump_enosys)
 
-int rump_sys_unlink(const char *);
+int rump___sysimpl_unlink(const char *);
 int
-rump_sys_unlink(const char * path)
+rump___sysimpl_unlink(const char * path)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -186,9 +186,9 @@ rump_sys_unlink(const char * path)
 }
 rsys_alias(sys_unlink,rump_enosys)
 
-int rump_sys_chdir(const char *);
+int rump___sysimpl_chdir(const char *);
 int
-rump_sys_chdir(const char * path)
+rump___sysimpl_chdir(const char * path)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -205,9 +205,9 @@ rump_sys_chdir(const char * path)
 }
 rsys_alias(sys_chdir,rump_enosys)
 
-int rump_sys_fchdir(int);
+int rump___sysimpl_fchdir(int);
 int
-rump_sys_fchdir(int fd)
+rump___sysimpl_fchdir(int fd)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -224,9 +224,9 @@ rump_sys_fchdir(int fd)
 }
 rsys_alias(sys_fchdir,rump_enosys)
 
-int rump_sys_chmod(const char *, mode_t);
+int rump___sysimpl_chmod(const char *, mode_t);
 int
-rump_sys_chmod(const char * path, mode_t mode)
+rump___sysimpl_chmod(const char * path, mode_t mode)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -244,9 +244,9 @@ rump_sys_chmod(const char * path, mode_t mode)
 }
 rsys_alias(sys_chmod,rump_enosys)
 
-int rump_sys_chown(const char *, uid_t, gid_t);
+int rump___sysimpl_chown(const char *, uid_t, gid_t);
 int
-rump_sys_chown(const char * path, uid_t uid, gid_t gid)
+rump___sysimpl_chown(const char * path, uid_t uid, gid_t gid)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -265,9 +265,9 @@ rump_sys_chown(const char * path, uid_t uid, gid_t gid)
 }
 rsys_alias(sys_chown,rump_enosys)
 
-pid_t rump_sys_getpid(void);
+pid_t rump___sysimpl_getpid(void);
 pid_t
-rump_sys_getpid(void )
+rump___sysimpl_getpid(void )
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -281,9 +281,9 @@ rump_sys_getpid(void )
 }
 rsys_alias(sys_getpid_with_ppid,rump_enosys)
 
-int rump_sys_unmount(const char *, int);
+int rump___sysimpl_unmount(const char *, int);
 int
-rump_sys_unmount(const char * path, int flags)
+rump___sysimpl_unmount(const char * path, int flags)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -301,9 +301,9 @@ rump_sys_unmount(const char * path, int flags)
 }
 rsys_alias(sys_unmount,rump_enosys)
 
-int rump_sys_setuid(uid_t);
+int rump___sysimpl_setuid(uid_t);
 int
-rump_sys_setuid(uid_t uid)
+rump___sysimpl_setuid(uid_t uid)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -320,9 +320,9 @@ rump_sys_setuid(uid_t uid)
 }
 rsys_alias(sys_setuid,rump_enosys)
 
-uid_t rump_sys_getuid(void);
+uid_t rump___sysimpl_getuid(void);
 uid_t
-rump_sys_getuid(void )
+rump___sysimpl_getuid(void )
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -336,9 +336,9 @@ rump_sys_getuid(void )
 }
 rsys_alias(sys_getuid_with_euid,rump_enosys)
 
-uid_t rump_sys_geteuid(void);
+uid_t rump___sysimpl_geteuid(void);
 uid_t
-rump_sys_geteuid(void )
+rump___sysimpl_geteuid(void )
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -352,9 +352,9 @@ rump_sys_geteuid(void )
 }
 rsys_alias(sys_geteuid,rump_enosys)
 
-ssize_t rump_sys_recvmsg(int, struct msghdr *, int);
+ssize_t rump___sysimpl_recvmsg(int, struct msghdr *, int);
 ssize_t
-rump_sys_recvmsg(int s, struct msghdr * msg, int flags)
+rump___sysimpl_recvmsg(int s, struct msghdr * msg, int flags)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -373,9 +373,9 @@ rump_sys_recvmsg(int s, struct msghdr * msg, int flags)
 }
 rsys_alias(sys_recvmsg,rump_enosys)
 
-ssize_t rump_sys_sendmsg(int, const struct msghdr *, int);
+ssize_t rump___sysimpl_sendmsg(int, const struct msghdr *, int);
 ssize_t
-rump_sys_sendmsg(int s, const struct msghdr * msg, int flags)
+rump___sysimpl_sendmsg(int s, const struct msghdr * msg, int flags)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -394,9 +394,9 @@ rump_sys_sendmsg(int s, const struct msghdr * msg, int flags)
 }
 rsys_alias(sys_sendmsg,rump_enosys)
 
-ssize_t rump_sys_recvfrom(int, void *, size_t, int, struct sockaddr *, unsigned int *);
+ssize_t rump___sysimpl_recvfrom(int, void *, size_t, int, struct sockaddr *, unsigned int *);
 ssize_t
-rump_sys_recvfrom(int s, void * buf, size_t len, int flags, struct sockaddr * from, unsigned int * fromlenaddr)
+rump___sysimpl_recvfrom(int s, void * buf, size_t len, int flags, struct sockaddr * from, unsigned int * fromlenaddr)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -418,9 +418,9 @@ rump_sys_recvfrom(int s, void * buf, size_t len, int flags, struct sockaddr * fr
 }
 rsys_alias(sys_recvfrom,rump_enosys)
 
-int rump_sys_accept(int, struct sockaddr *, unsigned int *);
+int rump___sysimpl_accept(int, struct sockaddr *, unsigned int *);
 int
-rump_sys_accept(int s, struct sockaddr * name, unsigned int * anamelen)
+rump___sysimpl_accept(int s, struct sockaddr * name, unsigned int * anamelen)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -439,9 +439,9 @@ rump_sys_accept(int s, struct sockaddr * name, unsigned int * anamelen)
 }
 rsys_alias(sys_accept,rump_enosys)
 
-int rump_sys_getpeername(int, struct sockaddr *, unsigned int *);
+int rump___sysimpl_getpeername(int, struct sockaddr *, unsigned int *);
 int
-rump_sys_getpeername(int fdes, struct sockaddr * asa, unsigned int * alen)
+rump___sysimpl_getpeername(int fdes, struct sockaddr * asa, unsigned int * alen)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -460,9 +460,9 @@ rump_sys_getpeername(int fdes, struct sockaddr * asa, unsigned int * alen)
 }
 rsys_alias(sys_getpeername,rump_enosys)
 
-int rump_sys_getsockname(int, struct sockaddr *, unsigned int *);
+int rump___sysimpl_getsockname(int, struct sockaddr *, unsigned int *);
 int
-rump_sys_getsockname(int fdes, struct sockaddr * asa, unsigned int * alen)
+rump___sysimpl_getsockname(int fdes, struct sockaddr * asa, unsigned int * alen)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -481,9 +481,9 @@ rump_sys_getsockname(int fdes, struct sockaddr * asa, unsigned int * alen)
 }
 rsys_alias(sys_getsockname,rump_enosys)
 
-int rump_sys_access(const char *, int);
+int rump___sysimpl_access(const char *, int);
 int
-rump_sys_access(const char * path, int flags)
+rump___sysimpl_access(const char * path, int flags)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -501,9 +501,9 @@ rump_sys_access(const char * path, int flags)
 }
 rsys_alias(sys_access,rump_enosys)
 
-int rump_sys_chflags(const char *, u_long);
+int rump___sysimpl_chflags(const char *, u_long);
 int
-rump_sys_chflags(const char * path, u_long flags)
+rump___sysimpl_chflags(const char * path, u_long flags)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -521,9 +521,9 @@ rump_sys_chflags(const char * path, u_long flags)
 }
 rsys_alias(sys_chflags,rump_enosys)
 
-int rump_sys_fchflags(int, u_long);
+int rump___sysimpl_fchflags(int, u_long);
 int
-rump_sys_fchflags(int fd, u_long flags)
+rump___sysimpl_fchflags(int fd, u_long flags)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -541,9 +541,9 @@ rump_sys_fchflags(int fd, u_long flags)
 }
 rsys_alias(sys_fchflags,rump_enosys)
 
-void rump_sys_sync(void);
+void rump___sysimpl_sync(void);
 void
-rump_sys_sync(void )
+rump___sysimpl_sync(void )
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -555,9 +555,9 @@ rump_sys_sync(void )
 }
 rsys_alias(sys_sync,rump_enosys)
 
-pid_t rump_sys_getppid(void);
+pid_t rump___sysimpl_getppid(void);
 pid_t
-rump_sys_getppid(void )
+rump___sysimpl_getppid(void )
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -571,9 +571,9 @@ rump_sys_getppid(void )
 }
 rsys_alias(sys_getppid,rump_enosys)
 
-int rump_sys_dup(int);
+int rump___sysimpl_dup(int);
 int
-rump_sys_dup(int fd)
+rump___sysimpl_dup(int fd)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -590,9 +590,9 @@ rump_sys_dup(int fd)
 }
 rsys_alias(sys_dup,rump_enosys)
 
-gid_t rump_sys_getegid(void);
+gid_t rump___sysimpl_getegid(void);
 gid_t
-rump_sys_getegid(void )
+rump___sysimpl_getegid(void )
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -606,9 +606,9 @@ rump_sys_getegid(void )
 }
 rsys_alias(sys_getegid,rump_enosys)
 
-gid_t rump_sys_getgid(void);
+gid_t rump___sysimpl_getgid(void);
 gid_t
-rump_sys_getgid(void )
+rump___sysimpl_getgid(void )
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -622,9 +622,9 @@ rump_sys_getgid(void )
 }
 rsys_alias(sys_getgid_with_egid,rump_enosys)
 
-int rump_sys___getlogin(char *, size_t);
+int rump___sysimpl___getlogin(char *, size_t);
 int
-rump_sys___getlogin(char * namebuf, size_t namelen)
+rump___sysimpl___getlogin(char * namebuf, size_t namelen)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -642,9 +642,9 @@ rump_sys___getlogin(char * namebuf, size_t namelen)
 }
 rsys_alias(sys___getlogin,rump_enosys)
 
-int rump_sys___setlogin(const char *);
+int rump___sysimpl___setlogin(const char *);
 int
-rump_sys___setlogin(const char * namebuf)
+rump___sysimpl___setlogin(const char * namebuf)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -661,9 +661,9 @@ rump_sys___setlogin(const char * namebuf)
 }
 rsys_alias(sys___setlogin,rump_enosys)
 
-int rump_sys_ioctl(int, u_long, void *);
+int rump___sysimpl_ioctl(int, u_long, void *);
 int
-rump_sys_ioctl(int fd, u_long com, void * data)
+rump___sysimpl_ioctl(int fd, u_long com, void * data)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -682,9 +682,9 @@ rump_sys_ioctl(int fd, u_long com, void * data)
 }
 rsys_alias(sys_ioctl,rump_enosys)
 
-int rump_sys_revoke(const char *);
+int rump___sysimpl_revoke(const char *);
 int
-rump_sys_revoke(const char * path)
+rump___sysimpl_revoke(const char * path)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -701,9 +701,9 @@ rump_sys_revoke(const char * path)
 }
 rsys_alias(sys_revoke,rump_enosys)
 
-int rump_sys_symlink(const char *, const char *);
+int rump___sysimpl_symlink(const char *, const char *);
 int
-rump_sys_symlink(const char * path, const char * link)
+rump___sysimpl_symlink(const char * path, const char * link)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -721,9 +721,9 @@ rump_sys_symlink(const char * path, const char * link)
 }
 rsys_alias(sys_symlink,rump_enosys)
 
-ssize_t rump_sys_readlink(const char *, char *, size_t);
+ssize_t rump___sysimpl_readlink(const char *, char *, size_t);
 ssize_t
-rump_sys_readlink(const char * path, char * buf, size_t count)
+rump___sysimpl_readlink(const char * path, char * buf, size_t count)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -742,9 +742,9 @@ rump_sys_readlink(const char * path, char * buf, size_t count)
 }
 rsys_alias(sys_readlink,rump_enosys)
 
-mode_t rump_sys_umask(mode_t);
+mode_t rump___sysimpl_umask(mode_t);
 mode_t
-rump_sys_umask(mode_t newmask)
+rump___sysimpl_umask(mode_t newmask)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -761,9 +761,9 @@ rump_sys_umask(mode_t newmask)
 }
 rsys_alias(sys_umask,rump_enosys)
 
-int rump_sys_chroot(const char *);
+int rump___sysimpl_chroot(const char *);
 int
-rump_sys_chroot(const char * path)
+rump___sysimpl_chroot(const char * path)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -780,9 +780,9 @@ rump_sys_chroot(const char * path)
 }
 rsys_alias(sys_chroot,rump_enosys)
 
-int rump_sys_getgroups(int, gid_t *);
+int rump___sysimpl_getgroups(int, gid_t *);
 int
-rump_sys_getgroups(int gidsetsize, gid_t * gidset)
+rump___sysimpl_getgroups(int gidsetsize, gid_t * gidset)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -800,9 +800,9 @@ rump_sys_getgroups(int gidsetsize, gid_t * gidset)
 }
 rsys_alias(sys_getgroups,rump_enosys)
 
-int rump_sys_setgroups(int, const gid_t *);
+int rump___sysimpl_setgroups(int, const gid_t *);
 int
-rump_sys_setgroups(int gidsetsize, const gid_t * gidset)
+rump___sysimpl_setgroups(int gidsetsize, const gid_t * gidset)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -820,9 +820,9 @@ rump_sys_setgroups(int gidsetsize, const gid_t * gidset)
 }
 rsys_alias(sys_setgroups,rump_enosys)
 
-int rump_sys_getpgrp(void);
+int rump___sysimpl_getpgrp(void);
 int
-rump_sys_getpgrp(void )
+rump___sysimpl_getpgrp(void )
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -836,9 +836,9 @@ rump_sys_getpgrp(void )
 }
 rsys_alias(sys_getpgrp,rump_enosys)
 
-int rump_sys_setpgid(int, int);
+int rump___sysimpl_setpgid(int, int);
 int
-rump_sys_setpgid(int pid, int pgid)
+rump___sysimpl_setpgid(int pid, int pgid)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -856,9 +856,9 @@ rump_sys_setpgid(int pid, int pgid)
 }
 rsys_alias(sys_setpgid,rump_enosys)
 
-int rump_sys_dup2(int, int);
+int rump___sysimpl_dup2(int, int);
 int
-rump_sys_dup2(int from, int to)
+rump___sysimpl_dup2(int from, int to)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -876,9 +876,9 @@ rump_sys_dup2(int from, int to)
 }
 rsys_alias(sys_dup2,rump_enosys)
 
-int rump_sys_fcntl(int, int, void *);
+int rump___sysimpl_fcntl(int, int, void *);
 int
-rump_sys_fcntl(int fd, int cmd, void * arg)
+rump___sysimpl_fcntl(int fd, int cmd, void * arg)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -897,9 +897,32 @@ rump_sys_fcntl(int fd, int cmd, void * arg)
 }
 rsys_alias(sys_fcntl,rump_enosys)
 
-int rump_sys_fsync(int);
+int rump___sysimpl_select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
 int
-rump_sys_fsync(int fd)
+rump___sysimpl_select(int nd, fd_set * in, fd_set * ou, fd_set * ex, struct timeval * tv)
+{
+	register_t rval[2] = {0, 0};
+	int error = 0;
+	struct compat_50_sys_select_args callarg;
+
+	SPARG(&callarg, nd) = nd;
+	SPARG(&callarg, in) = in;
+	SPARG(&callarg, ou) = ou;
+	SPARG(&callarg, ex) = ex;
+	SPARG(&callarg, tv) = (struct timeval50 *)tv;
+
+	error = rsys_syscall(SYS_compat_50_select, &callarg, sizeof(callarg), rval);
+	if (error) {
+		rval[0] = -1;
+		rsys_seterrno(error);
+	}
+	return rval[0];
+}
+rsys_alias(compat_50_sys_select,rump_enosys)
+
+int rump___sysimpl_fsync(int);
+int
+rump___sysimpl_fsync(int fd)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -916,9 +939,9 @@ rump_sys_fsync(int fd)
 }
 rsys_alias(sys_fsync,rump_enosys)
 
-int rump_sys_connect(int, const struct sockaddr *, unsigned int);
+int rump___sysimpl_connect(int, const struct sockaddr *, unsigned int);
 int
-rump_sys_connect(int s, const struct sockaddr * name, unsigned int namelen)
+rump___sysimpl_connect(int s, const struct sockaddr * name, unsigned int namelen)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -937,9 +960,9 @@ rump_sys_connect(int s, const struct sockaddr * name, unsigned int namelen)
 }
 rsys_alias(sys_connect,rump_enosys)
 
-int rump_sys_bind(int, const struct sockaddr *, unsigned int);
+int rump___sysimpl_bind(int, const struct sockaddr *, unsigned int);
 int
-rump_sys_bind(int s, const struct sockaddr * name, unsigned int namelen)
+rump___sysimpl_bind(int s, const struct sockaddr * name, unsigned int namelen)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -958,9 +981,9 @@ rump_sys_bind(int s, const struct sockaddr * name, unsigned int namelen)
 }
 rsys_alias(sys_bind,rump_enosys)
 
-int rump_sys_setsockopt(int, int, int, const void *, unsigned int);
+int rump___sysimpl_setsockopt(int, int, int, const void *, unsigned int);
 int
-rump_sys_setsockopt(int s, int level, int name, const void * val, unsigned int valsize)
+rump___sysimpl_setsockopt(int s, int level, int name, const void * val, unsigned int valsize)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -981,9 +1004,9 @@ rump_sys_setsockopt(int s, int level, int name, const void * val, unsigned int v
 }
 rsys_alias(sys_setsockopt,rump_enosys)
 
-int rump_sys_listen(int, int);
+int rump___sysimpl_listen(int, int);
 int
-rump_sys_listen(int s, int backlog)
+rump___sysimpl_listen(int s, int backlog)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1001,9 +1024,9 @@ rump_sys_listen(int s, int backlog)
 }
 rsys_alias(sys_listen,rump_enosys)
 
-int rump_sys_getsockopt(int, int, int, void *, unsigned int *);
+int rump___sysimpl_getsockopt(int, int, int, void *, unsigned int *);
 int
-rump_sys_getsockopt(int s, int level, int name, void * val, unsigned int * avalsize)
+rump___sysimpl_getsockopt(int s, int level, int name, void * val, unsigned int * avalsize)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1024,9 +1047,9 @@ rump_sys_getsockopt(int s, int level, int name, void * val, unsigned int * avals
 }
 rsys_alias(sys_getsockopt,rump_enosys)
 
-ssize_t rump_sys_readv(int, const struct iovec *, int);
+ssize_t rump___sysimpl_readv(int, const struct iovec *, int);
 ssize_t
-rump_sys_readv(int fd, const struct iovec * iovp, int iovcnt)
+rump___sysimpl_readv(int fd, const struct iovec * iovp, int iovcnt)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1045,9 +1068,9 @@ rump_sys_readv(int fd, const struct iovec * iovp, int iovcnt)
 }
 rsys_alias(sys_readv,rump_enosys)
 
-ssize_t rump_sys_writev(int, const struct iovec *, int);
+ssize_t rump___sysimpl_writev(int, const struct iovec *, int);
 ssize_t
-rump_sys_writev(int fd, const struct iovec * iovp, int iovcnt)
+rump___sysimpl_writev(int fd, const struct iovec * iovp, int iovcnt)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1066,9 +1089,9 @@ rump_sys_writev(int fd, const struct iovec * iovp, int iovcnt)
 }
 rsys_alias(sys_writev,rump_enosys)
 
-int rump_sys_fchown(int, uid_t, gid_t);
+int rump___sysimpl_fchown(int, uid_t, gid_t);
 int
-rump_sys_fchown(int fd, uid_t uid, gid_t gid)
+rump___sysimpl_fchown(int fd, uid_t uid, gid_t gid)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1087,9 +1110,9 @@ rump_sys_fchown(int fd, uid_t uid, gid_t gid)
 }
 rsys_alias(sys_fchown,rump_enosys)
 
-int rump_sys_fchmod(int, mode_t);
+int rump___sysimpl_fchmod(int, mode_t);
 int
-rump_sys_fchmod(int fd, mode_t mode)
+rump___sysimpl_fchmod(int fd, mode_t mode)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1107,9 +1130,9 @@ rump_sys_fchmod(int fd, mode_t mode)
 }
 rsys_alias(sys_fchmod,rump_enosys)
 
-int rump_sys_setreuid(uid_t, uid_t);
+int rump___sysimpl_setreuid(uid_t, uid_t);
 int
-rump_sys_setreuid(uid_t ruid, uid_t euid)
+rump___sysimpl_setreuid(uid_t ruid, uid_t euid)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1127,9 +1150,9 @@ rump_sys_setreuid(uid_t ruid, uid_t euid)
 }
 rsys_alias(sys_setreuid,rump_enosys)
 
-int rump_sys_setregid(gid_t, gid_t);
+int rump___sysimpl_setregid(gid_t, gid_t);
 int
-rump_sys_setregid(gid_t rgid, gid_t egid)
+rump___sysimpl_setregid(gid_t rgid, gid_t egid)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1147,9 +1170,9 @@ rump_sys_setregid(gid_t rgid, gid_t egid)
 }
 rsys_alias(sys_setregid,rump_enosys)
 
-int rump_sys_rename(const char *, const char *);
+int rump___sysimpl_rename(const char *, const char *);
 int
-rump_sys_rename(const char * from, const char * to)
+rump___sysimpl_rename(const char * from, const char * to)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1167,9 +1190,9 @@ rump_sys_rename(const char * from, const char * to)
 }
 rsys_alias(sys_rename,rump_enosys)
 
-int rump_sys_flock(int, int);
+int rump___sysimpl_flock(int, int);
 int
-rump_sys_flock(int fd, int how)
+rump___sysimpl_flock(int fd, int how)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1187,9 +1210,9 @@ rump_sys_flock(int fd, int how)
 }
 rsys_alias(sys_flock,rump_enosys)
 
-int rump_sys_mkfifo(const char *, mode_t);
+int rump___sysimpl_mkfifo(const char *, mode_t);
 int
-rump_sys_mkfifo(const char * path, mode_t mode)
+rump___sysimpl_mkfifo(const char * path, mode_t mode)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1207,9 +1230,9 @@ rump_sys_mkfifo(const char * path, mode_t mode)
 }
 rsys_alias(sys_mkfifo,rump_enosys)
 
-ssize_t rump_sys_sendto(int, const void *, size_t, int, const struct sockaddr *, unsigned int);
+ssize_t rump___sysimpl_sendto(int, const void *, size_t, int, const struct sockaddr *, unsigned int);
 ssize_t
-rump_sys_sendto(int s, const void * buf, size_t len, int flags, const struct sockaddr * to, unsigned int tolen)
+rump___sysimpl_sendto(int s, const void * buf, size_t len, int flags, const struct sockaddr * to, unsigned int tolen)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1231,9 +1254,9 @@ rump_sys_sendto(int s, const void * buf, size_t len, int flags, const struct soc
 }
 rsys_alias(sys_sendto,rump_enosys)
 
-int rump_sys_shutdown(int, int);
+int rump___sysimpl_shutdown(int, int);
 int
-rump_sys_shutdown(int s, int how)
+rump___sysimpl_shutdown(int s, int how)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1251,9 +1274,9 @@ rump_sys_shutdown(int s, int how)
 }
 rsys_alias(sys_shutdown,rump_enosys)
 
-int rump_sys_socketpair(int, int, int, int *);
+int rump___sysimpl_socketpair(int, int, int, int *);
 int
-rump_sys_socketpair(int domain, int type, int protocol, int * rsv)
+rump___sysimpl_socketpair(int domain, int type, int protocol, int * rsv)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1273,9 +1296,9 @@ rump_sys_socketpair(int domain, int type, int protocol, int * rsv)
 }
 rsys_alias(sys_socketpair,rump_enosys)
 
-int rump_sys_mkdir(const char *, mode_t);
+int rump___sysimpl_mkdir(const char *, mode_t);
 int
-rump_sys_mkdir(const char * path, mode_t mode)
+rump___sysimpl_mkdir(const char * path, mode_t mode)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1293,9 +1316,9 @@ rump_sys_mkdir(const char * path, mode_t mode)
 }
 rsys_alias(sys_mkdir,rump_enosys)
 
-int rump_sys_rmdir(const char *);
+int rump___sysimpl_rmdir(const char *);
 int
-rump_sys_rmdir(const char * path)
+rump___sysimpl_rmdir(const char * path)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1312,9 +1335,29 @@ rump_sys_rmdir(const char * path)
 }
 rsys_alias(sys_rmdir,rump_enosys)
 
-int rump_sys_setsid(void);
+int rump___sysimpl_utimes(const char *, const struct timeval *);
 int
-rump_sys_setsid(void )
+rump___sysimpl_utimes(const char * path, const struct timeval * tptr)
+{
+	register_t rval[2] = {0, 0};
+	int error = 0;
+	struct compat_50_sys_utimes_args callarg;
+
+	SPARG(&callarg, path) = path;
+	SPARG(&callarg, tptr) = (const struct timeval50 *)tptr;
+
+	error = rsys_syscall(SYS_compat_50_utimes, &callarg, sizeof(callarg), rval);
+	if (error) {
+		rval[0] = -1;
+		rsys_seterrno(error);
+	}
+	return rval[0];
+}
+rsys_alias(compat_50_sys_utimes,rump_enosys)
+
+int rump___sysimpl_setsid(void);
+int
+rump___sysimpl_setsid(void )
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1328,9 +1371,9 @@ rump_sys_setsid(void )
 }
 rsys_alias(sys_setsid,rump_enosys)
 
-int rump_sys_nfssvc(int, void *);
+int rump___sysimpl_nfssvc(int, void *);
 int
-rump_sys_nfssvc(int flag, void * argp)
+rump___sysimpl_nfssvc(int flag, void * argp)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1348,9 +1391,9 @@ rump_sys_nfssvc(int flag, void * argp)
 }
 rsys_alias(sys_nfssvc,rump_enosys)
 
-ssize_t rump_sys_pread(int, void *, size_t, off_t);
+ssize_t rump___sysimpl_pread(int, void *, size_t, off_t);
 ssize_t
-rump_sys_pread(int fd, void * buf, size_t nbyte, off_t offset)
+rump___sysimpl_pread(int fd, void * buf, size_t nbyte, off_t offset)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1371,9 +1414,9 @@ rump_sys_pread(int fd, void * buf, size_t nbyte, off_t offset)
 }
 rsys_alias(sys_pread,rump_enosys)
 
-ssize_t rump_sys_pwrite(int, const void *, size_t, off_t);
+ssize_t rump___sysimpl_pwrite(int, const void *, size_t, off_t);
 ssize_t
-rump_sys_pwrite(int fd, const void * buf, size_t nbyte, off_t offset)
+rump___sysimpl_pwrite(int fd, const void * buf, size_t nbyte, off_t offset)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1394,9 +1437,9 @@ rump_sys_pwrite(int fd, const void * buf, size_t nbyte, off_t offset)
 }
 rsys_alias(sys_pwrite,rump_enosys)
 
-int rump_sys_setgid(gid_t);
+int rump___sysimpl_setgid(gid_t);
 int
-rump_sys_setgid(gid_t gid)
+rump___sysimpl_setgid(gid_t gid)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1413,9 +1456,9 @@ rump_sys_setgid(gid_t gid)
 }
 rsys_alias(sys_setgid,rump_enosys)
 
-int rump_sys_setegid(gid_t);
+int rump___sysimpl_setegid(gid_t);
 int
-rump_sys_setegid(gid_t egid)
+rump___sysimpl_setegid(gid_t egid)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1432,9 +1475,9 @@ rump_sys_setegid(gid_t egid)
 }
 rsys_alias(sys_setegid,rump_enosys)
 
-int rump_sys_seteuid(uid_t);
+int rump___sysimpl_seteuid(uid_t);
 int
-rump_sys_seteuid(uid_t euid)
+rump___sysimpl_seteuid(uid_t euid)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1451,9 +1494,9 @@ rump_sys_seteuid(uid_t euid)
 }
 rsys_alias(sys_seteuid,rump_enosys)
 
-long rump_sys_pathconf(const char *, int);
+long rump___sysimpl_pathconf(const char *, int);
 long
-rump_sys_pathconf(const char * path, int name)
+rump___sysimpl_pathconf(const char * path, int name)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1471,9 +1514,9 @@ rump_sys_pathconf(const char * path, int name)
 }
 rsys_alias(sys_pathconf,rump_enosys)
 
-long rump_sys_fpathconf(int, int);
+long rump___sysimpl_fpathconf(int, int);
 long
-rump_sys_fpathconf(int fd, int name)
+rump___sysimpl_fpathconf(int fd, int name)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1491,9 +1534,9 @@ rump_sys_fpathconf(int fd, int name)
 }
 rsys_alias(sys_fpathconf,rump_enosys)
 
-int rump_sys_getrlimit(int, struct rlimit *);
+int rump___sysimpl_getrlimit(int, struct rlimit *);
 int
-rump_sys_getrlimit(int which, struct rlimit * rlp)
+rump___sysimpl_getrlimit(int which, struct rlimit * rlp)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1511,9 +1554,9 @@ rump_sys_getrlimit(int which, struct rlimit * rlp)
 }
 rsys_alias(sys_getrlimit,rump_enosys)
 
-int rump_sys_setrlimit(int, const struct rlimit *);
+int rump___sysimpl_setrlimit(int, const struct rlimit *);
 int
-rump_sys_setrlimit(int which, const struct rlimit * rlp)
+rump___sysimpl_setrlimit(int which, const struct rlimit * rlp)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1531,9 +1574,9 @@ rump_sys_setrlimit(int which, const struct rlimit * rlp)
 }
 rsys_alias(sys_setrlimit,rump_enosys)
 
-off_t rump_sys_lseek(int, off_t, int);
+off_t rump___sysimpl_lseek(int, off_t, int);
 off_t
-rump_sys_lseek(int fd, off_t offset, int whence)
+rump___sysimpl_lseek(int fd, off_t offset, int whence)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1553,9 +1596,9 @@ rump_sys_lseek(int fd, off_t offset, int whence)
 }
 rsys_alias(sys_lseek,rump_enosys)
 
-int rump_sys_truncate(const char *, off_t);
+int rump___sysimpl_truncate(const char *, off_t);
 int
-rump_sys_truncate(const char * path, off_t length)
+rump___sysimpl_truncate(const char * path, off_t length)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1574,9 +1617,9 @@ rump_sys_truncate(const char * path, off_t length)
 }
 rsys_alias(sys_truncate,rump_enosys)
 
-int rump_sys_ftruncate(int, off_t);
+int rump___sysimpl_ftruncate(int, off_t);
 int
-rump_sys_ftruncate(int fd, off_t length)
+rump___sysimpl_ftruncate(int fd, off_t length)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1595,9 +1638,9 @@ rump_sys_ftruncate(int fd, off_t length)
 }
 rsys_alias(sys_ftruncate,rump_enosys)
 
-int rump_sys___sysctl(const int *, u_int, void *, size_t *, const void *, size_t);
+int rump___sysimpl___sysctl(const int *, u_int, void *, size_t *, const void *, size_t);
 int
-rump_sys___sysctl(const int * name, u_int namelen, void * old, size_t * oldlenp, const void * new, size_t newlen)
+rump___sysimpl___sysctl(const int * name, u_int namelen, void * old, size_t * oldlenp, const void * new, size_t newlen)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1619,9 +1662,29 @@ rump_sys___sysctl(const int * name, u_int namelen, void * old, size_t * oldlenp,
 }
 rsys_alias(sys___sysctl,rump_enosys)
 
-pid_t rump_sys_getpgid(pid_t);
+int rump___sysimpl_futimes(int, const struct timeval *);
+int
+rump___sysimpl_futimes(int fd, const struct timeval * tptr)
+{
+	register_t rval[2] = {0, 0};
+	int error = 0;
+	struct compat_50_sys_futimes_args callarg;
+
+	SPARG(&callarg, fd) = fd;
+	SPARG(&callarg, tptr) = (const struct timeval50 *)tptr;
+
+	error = rsys_syscall(SYS_compat_50_futimes, &callarg, sizeof(callarg), rval);
+	if (error) {
+		rval[0] = -1;
+		rsys_seterrno(error);
+	}
+	return rval[0];
+}
+rsys_alias(compat_50_sys_futimes,rump_enosys)
+
+pid_t rump___sysimpl_getpgid(pid_t);
 pid_t
-rump_sys_getpgid(pid_t pid)
+rump___sysimpl_getpgid(pid_t pid)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1638,9 +1701,9 @@ rump_sys_getpgid(pid_t pid)
 }
 rsys_alias(sys_getpgid,rump_enosys)
 
-int rump_sys_reboot(int, char *);
+int rump___sysimpl_reboot(int, char *);
 int
-rump_sys_reboot(int opt, char * bootstr)
+rump___sysimpl_reboot(int opt, char * bootstr)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1658,9 +1721,9 @@ rump_sys_reboot(int opt, char * bootstr)
 }
 rsys_alias(sys_reboot,rump_enosys)
 
-int rump_sys_poll(struct pollfd *, u_int, int);
+int rump___sysimpl_poll(struct pollfd *, u_int, int);
 int
-rump_sys_poll(struct pollfd * fds, u_int nfds, int timeout)
+rump___sysimpl_poll(struct pollfd * fds, u_int nfds, int timeout)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1679,9 +1742,9 @@ rump_sys_poll(struct pollfd * fds, u_int nfds, int timeout)
 }
 rsys_alias(sys_poll,rump_enosys)
 
-int rump_sys_fdatasync(int);
+int rump___sysimpl_fdatasync(int);
 int
-rump_sys_fdatasync(int fd)
+rump___sysimpl_fdatasync(int fd)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1698,9 +1761,9 @@ rump_sys_fdatasync(int fd)
 }
 rsys_alias(sys_fdatasync,rump_enosys)
 
-int rump_sys_modctl(int, void *);
+int rump___sysimpl_modctl(int, void *);
 int
-rump_sys_modctl(int cmd, void * arg)
+rump___sysimpl_modctl(int cmd, void * arg)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1718,9 +1781,9 @@ rump_sys_modctl(int cmd, void * arg)
 }
 rsys_alias(sys_modctl,rump_enosys)
 
-int rump_sys__ksem_init(unsigned int, intptr_t *);
+int rump___sysimpl__ksem_init(unsigned int, intptr_t *);
 int
-rump_sys__ksem_init(unsigned int value, intptr_t * idp)
+rump___sysimpl__ksem_init(unsigned int value, intptr_t * idp)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1738,9 +1801,9 @@ rump_sys__ksem_init(unsigned int value, intptr_t * idp)
 }
 rsys_alias(sys__ksem_init,rump_enosys)
 
-int rump_sys__ksem_open(const char *, int, mode_t, unsigned int, intptr_t *);
+int rump___sysimpl__ksem_open(const char *, int, mode_t, unsigned int, intptr_t *);
 int
-rump_sys__ksem_open(const char * name, int oflag, mode_t mode, unsigned int value, intptr_t * idp)
+rump___sysimpl__ksem_open(const char * name, int oflag, mode_t mode, unsigned int value, intptr_t * idp)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1761,9 +1824,9 @@ rump_sys__ksem_open(const char * name, int oflag, mode_t mode, unsigned int valu
 }
 rsys_alias(sys__ksem_open,rump_enosys)
 
-int rump_sys__ksem_unlink(const char *);
+int rump___sysimpl__ksem_unlink(const char *);
 int
-rump_sys__ksem_unlink(const char * name)
+rump___sysimpl__ksem_unlink(const char * name)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1780,9 +1843,9 @@ rump_sys__ksem_unlink(const char * name)
 }
 rsys_alias(sys__ksem_unlink,rump_enosys)
 
-int rump_sys__ksem_close(intptr_t);
+int rump___sysimpl__ksem_close(intptr_t);
 int
-rump_sys__ksem_close(intptr_t id)
+rump___sysimpl__ksem_close(intptr_t id)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1799,9 +1862,9 @@ rump_sys__ksem_close(intptr_t id)
 }
 rsys_alias(sys__ksem_close,rump_enosys)
 
-int rump_sys__ksem_post(intptr_t);
+int rump___sysimpl__ksem_post(intptr_t);
 int
-rump_sys__ksem_post(intptr_t id)
+rump___sysimpl__ksem_post(intptr_t id)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1818,9 +1881,9 @@ rump_sys__ksem_post(intptr_t id)
 }
 rsys_alias(sys__ksem_post,rump_enosys)
 
-int rump_sys__ksem_wait(intptr_t);
+int rump___sysimpl__ksem_wait(intptr_t);
 int
-rump_sys__ksem_wait(intptr_t id)
+rump___sysimpl__ksem_wait(intptr_t id)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1837,9 +1900,9 @@ rump_sys__ksem_wait(intptr_t id)
 }
 rsys_alias(sys__ksem_wait,rump_enosys)
 
-int rump_sys__ksem_trywait(intptr_t);
+int rump___sysimpl__ksem_trywait(intptr_t);
 int
-rump_sys__ksem_trywait(intptr_t id)
+rump___sysimpl__ksem_trywait(intptr_t id)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1856,9 +1919,9 @@ rump_sys__ksem_trywait(intptr_t id)
 }
 rsys_alias(sys__ksem_trywait,rump_enosys)
 
-int rump_sys__ksem_getvalue(intptr_t, unsigned int *);
+int rump___sysimpl__ksem_getvalue(intptr_t, unsigned int *);
 int
-rump_sys__ksem_getvalue(intptr_t id, unsigned int * value)
+rump___sysimpl__ksem_getvalue(intptr_t id, unsigned int * value)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1876,9 +1939,9 @@ rump_sys__ksem_getvalue(intptr_t id, unsigned int * value)
 }
 rsys_alias(sys__ksem_getvalue,rump_enosys)
 
-int rump_sys__ksem_destroy(intptr_t);
+int rump___sysimpl__ksem_destroy(intptr_t);
 int
-rump_sys__ksem_destroy(intptr_t id)
+rump___sysimpl__ksem_destroy(intptr_t id)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1895,9 +1958,9 @@ rump_sys__ksem_destroy(intptr_t id)
 }
 rsys_alias(sys__ksem_destroy,rump_enosys)
 
-int rump_sys_lchmod(const char *, mode_t);
+int rump___sysimpl_lchmod(const char *, mode_t);
 int
-rump_sys_lchmod(const char * path, mode_t mode)
+rump___sysimpl_lchmod(const char * path, mode_t mode)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1915,9 +1978,9 @@ rump_sys_lchmod(const char * path, mode_t mode)
 }
 rsys_alias(sys_lchmod,rump_enosys)
 
-int rump_sys_lchown(const char *, uid_t, gid_t);
+int rump___sysimpl_lchown(const char *, uid_t, gid_t);
 int
-rump_sys_lchown(const char * path, uid_t uid, gid_t gid)
+rump___sysimpl_lchown(const char * path, uid_t uid, gid_t gid)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1936,9 +1999,29 @@ rump_sys_lchown(const char * path, uid_t uid, gid_t gid)
 }
 rsys_alias(sys_lchown,rump_enosys)
 
-pid_t rump_sys_getsid(pid_t);
+int rump___sysimpl_lutimes(const char *, const struct timeval *);
+int
+rump___sysimpl_lutimes(const char * path, const struct timeval * tptr)
+{
+	register_t rval[2] = {0, 0};
+	int error = 0;
+	struct compat_50_sys_lutimes_args callarg;
+
+	SPARG(&callarg, path) = path;
+	SPARG(&callarg, tptr) = (const struct timeval50 *)tptr;
+
+	error = rsys_syscall(SYS_compat_50_lutimes, &callarg, sizeof(callarg), rval);
+	if (error) {
+		rval[0] = -1;
+		rsys_seterrno(error);
+	}
+	return rval[0];
+}
+rsys_alias(compat_50_sys_lutimes,rump_enosys)
+
+pid_t rump___sysimpl_getsid(pid_t);
 pid_t
-rump_sys_getsid(pid_t pid)
+rump___sysimpl_getsid(pid_t pid)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1955,9 +2038,9 @@ rump_sys_getsid(pid_t pid)
 }
 rsys_alias(sys_getsid,rump_enosys)
 
-int rump_sys___getcwd(char *, size_t);
+int rump___sysimpl___getcwd(char *, size_t);
 int
-rump_sys___getcwd(char * bufp, size_t length)
+rump___sysimpl___getcwd(char * bufp, size_t length)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1975,9 +2058,9 @@ rump_sys___getcwd(char * bufp, size_t length)
 }
 rsys_alias(sys___getcwd,rump_enosys)
 
-int rump_sys_fchroot(int);
+int rump___sysimpl_fchroot(int);
 int
-rump_sys_fchroot(int fd)
+rump___sysimpl_fchroot(int fd)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -1994,9 +2077,9 @@ rump_sys_fchroot(int fd)
 }
 rsys_alias(sys_fchroot,rump_enosys)
 
-int rump_sys_lchflags(const char *, u_long);
+int rump___sysimpl_lchflags(const char *, u_long);
 int
-rump_sys_lchflags(const char * path, u_long flags)
+rump___sysimpl_lchflags(const char * path, u_long flags)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2014,9 +2097,9 @@ rump_sys_lchflags(const char * path, u_long flags)
 }
 rsys_alias(sys_lchflags,rump_enosys)
 
-int rump_sys_issetugid(void);
+int rump___sysimpl_issetugid(void);
 int
-rump_sys_issetugid(void )
+rump___sysimpl_issetugid(void )
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2030,9 +2113,9 @@ rump_sys_issetugid(void )
 }
 rsys_alias(sys_issetugid,rump_enosys)
 
-int rump_sys_kqueue(void);
+int rump___sysimpl_kqueue(void);
 int
-rump_sys_kqueue(void )
+rump___sysimpl_kqueue(void )
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2046,9 +2129,33 @@ rump_sys_kqueue(void )
 }
 rsys_alias(sys_kqueue,rump_enosys)
 
-int rump_sys_fsync_range(int, int, off_t, off_t);
+int rump___sysimpl_kevent(int, const struct kevent *, size_t, struct kevent *, size_t, const struct timespec *);
 int
-rump_sys_fsync_range(int fd, int flags, off_t start, off_t length)
+rump___sysimpl_kevent(int fd, const struct kevent * changelist, size_t nchanges, struct kevent * eventlist, size_t nevents, const struct timespec * timeout)
+{
+	register_t rval[2] = {0, 0};
+	int error = 0;
+	struct compat_50_sys_kevent_args callarg;
+
+	SPARG(&callarg, fd) = fd;
+	SPARG(&callarg, changelist) = changelist;
+	SPARG(&callarg, nchanges) = nchanges;
+	SPARG(&callarg, eventlist) = eventlist;
+	SPARG(&callarg, nevents) = nevents;
+	SPARG(&callarg, timeout) = (const struct timespec50 *)timeout;
+
+	error = rsys_syscall(SYS_compat_50_kevent, &callarg, sizeof(callarg), rval);
+	if (error) {
+		rval[0] = -1;
+		rsys_seterrno(error);
+	}
+	return rval[0];
+}
+rsys_alias(compat_50_sys_kevent,rump_enosys)
+
+int rump___sysimpl_fsync_range(int, int, off_t, off_t);
+int
+rump___sysimpl_fsync_range(int fd, int flags, off_t start, off_t length)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2068,9 +2175,9 @@ rump_sys_fsync_range(int fd, int flags, off_t start, off_t length)
 }
 rsys_alias(sys_fsync_range,rump_enosys)
 
-int rump_sys_getvfsstat(struct statvfs *, size_t, int);
+int rump___sysimpl_getvfsstat(struct statvfs *, size_t, int);
 int
-rump_sys_getvfsstat(struct statvfs * buf, size_t bufsize, int flags)
+rump___sysimpl_getvfsstat(struct statvfs * buf, size_t bufsize, int flags)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2089,9 +2196,9 @@ rump_sys_getvfsstat(struct statvfs * buf, size_t bufsize, int flags)
 }
 rsys_alias(sys_getvfsstat,rump_enosys)
 
-int rump_sys_statvfs1(const char *, struct statvfs *, int);
+int rump___sysimpl_statvfs1(const char *, struct statvfs *, int);
 int
-rump_sys_statvfs1(const char * path, struct statvfs * buf, int flags)
+rump___sysimpl_statvfs1(const char * path, struct statvfs * buf, int flags)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2110,9 +2217,9 @@ rump_sys_statvfs1(const char * path, struct statvfs * buf, int flags)
 }
 rsys_alias(sys_statvfs1,rump_enosys)
 
-int rump_sys_fstatvfs1(int, struct statvfs *, int);
+int rump___sysimpl_fstatvfs1(int, struct statvfs *, int);
 int
-rump_sys_fstatvfs1(int fd, struct statvfs * buf, int flags)
+rump___sysimpl_fstatvfs1(int fd, struct statvfs * buf, int flags)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2131,9 +2238,9 @@ rump_sys_fstatvfs1(int fd, struct statvfs * buf, int flags)
 }
 rsys_alias(sys_fstatvfs1,rump_enosys)
 
-int rump_sys_extattrctl(const char *, int, const char *, int, const char *);
+int rump___sysimpl_extattrctl(const char *, int, const char *, int, const char *);
 int
-rump_sys_extattrctl(const char * path, int cmd, const char * filename, int attrnamespace, const char * attrname)
+rump___sysimpl_extattrctl(const char * path, int cmd, const char * filename, int attrnamespace, const char * attrname)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2154,9 +2261,9 @@ rump_sys_extattrctl(const char * path, int cmd, const char * filename, int attrn
 }
 rsys_alias(sys_extattrctl,rump_enosys)
 
-int rump_sys_extattr_set_file(const char *, int, const char *, const void *, size_t);
+int rump___sysimpl_extattr_set_file(const char *, int, const char *, const void *, size_t);
 int
-rump_sys_extattr_set_file(const char * path, int attrnamespace, const char * attrname, const void * data, size_t nbytes)
+rump___sysimpl_extattr_set_file(const char * path, int attrnamespace, const char * attrname, const void * data, size_t nbytes)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2177,9 +2284,9 @@ rump_sys_extattr_set_file(const char * path, int attrnamespace, const char * att
 }
 rsys_alias(sys_extattr_set_file,rump_enosys)
 
-ssize_t rump_sys_extattr_get_file(const char *, int, const char *, void *, size_t);
+ssize_t rump___sysimpl_extattr_get_file(const char *, int, const char *, void *, size_t);
 ssize_t
-rump_sys_extattr_get_file(const char * path, int attrnamespace, const char * attrname, void * data, size_t nbytes)
+rump___sysimpl_extattr_get_file(const char * path, int attrnamespace, const char * attrname, void * data, size_t nbytes)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2200,9 +2307,9 @@ rump_sys_extattr_get_file(const char * path, int attrnamespace, const char * att
 }
 rsys_alias(sys_extattr_get_file,rump_enosys)
 
-int rump_sys_extattr_delete_file(const char *, int, const char *);
+int rump___sysimpl_extattr_delete_file(const char *, int, const char *);
 int
-rump_sys_extattr_delete_file(const char * path, int attrnamespace, const char * attrname)
+rump___sysimpl_extattr_delete_file(const char * path, int attrnamespace, const char * attrname)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2221,9 +2328,9 @@ rump_sys_extattr_delete_file(const char * path, int attrnamespace, const char *
 }
 rsys_alias(sys_extattr_delete_file,rump_enosys)
 
-int rump_sys_extattr_set_fd(int, int, const char *, const void *, size_t);
+int rump___sysimpl_extattr_set_fd(int, int, const char *, const void *, size_t);
 int
-rump_sys_extattr_set_fd(int fd, int attrnamespace, const char * attrname, const void * data, size_t nbytes)
+rump___sysimpl_extattr_set_fd(int fd, int attrnamespace, const char * attrname, const void * data, size_t nbytes)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2244,9 +2351,9 @@ rump_sys_extattr_set_fd(int fd, int attrnamespace, const char * attrname, const
 }
 rsys_alias(sys_extattr_set_fd,rump_enosys)
 
-ssize_t rump_sys_extattr_get_fd(int, int, const char *, void *, size_t);
+ssize_t rump___sysimpl_extattr_get_fd(int, int, const char *, void *, size_t);
 ssize_t
-rump_sys_extattr_get_fd(int fd, int attrnamespace, const char * attrname, void * data, size_t nbytes)
+rump___sysimpl_extattr_get_fd(int fd, int attrnamespace, const char * attrname, void * data, size_t nbytes)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2267,9 +2374,9 @@ rump_sys_extattr_get_fd(int fd, int attrnamespace, const char * attrname, void *
 }
 rsys_alias(sys_extattr_get_fd,rump_enosys)
 
-int rump_sys_extattr_delete_fd(int, int, const char *);
+int rump___sysimpl_extattr_delete_fd(int, int, const char *);
 int
-rump_sys_extattr_delete_fd(int fd, int attrnamespace, const char * attrname)
+rump___sysimpl_extattr_delete_fd(int fd, int attrnamespace, const char * attrname)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2288,9 +2395,9 @@ rump_sys_extattr_delete_fd(int fd, int attrnamespace, const char * attrname)
 }
 rsys_alias(sys_extattr_delete_fd,rump_enosys)
 
-int rump_sys_extattr_set_link(const char *, int, const char *, const void *, size_t);
+int rump___sysimpl_extattr_set_link(const char *, int, const char *, const void *, size_t);
 int
-rump_sys_extattr_set_link(const char * path, int attrnamespace, const char * attrname, const void * data, size_t nbytes)
+rump___sysimpl_extattr_set_link(const char * path, int attrnamespace, const char * attrname, const void * data, size_t nbytes)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2311,9 +2418,9 @@ rump_sys_extattr_set_link(const char * path, int attrnamespace, const char * att
 }
 rsys_alias(sys_extattr_set_link,rump_enosys)
 
-ssize_t rump_sys_extattr_get_link(const char *, int, const char *, void *, size_t);
+ssize_t rump___sysimpl_extattr_get_link(const char *, int, const char *, void *, size_t);
 ssize_t
-rump_sys_extattr_get_link(const char * path, int attrnamespace, const char * attrname, void * data, size_t nbytes)
+rump___sysimpl_extattr_get_link(const char * path, int attrnamespace, const char * attrname, void * data, size_t nbytes)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2334,9 +2441,9 @@ rump_sys_extattr_get_link(const char * path, int attrnamespace, const char * att
 }
 rsys_alias(sys_extattr_get_link,rump_enosys)
 
-int rump_sys_extattr_delete_link(const char *, int, const char *);
+int rump___sysimpl_extattr_delete_link(const char *, int, const char *);
 int
-rump_sys_extattr_delete_link(const char * path, int attrnamespace, const char * attrname)
+rump___sysimpl_extattr_delete_link(const char * path, int attrnamespace, const char * attrname)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2355,9 +2462,9 @@ rump_sys_extattr_delete_link(const char * path, int attrnamespace, const char *
 }
 rsys_alias(sys_extattr_delete_link,rump_enosys)
 
-ssize_t rump_sys_extattr_list_fd(int, int, void *, size_t);
+ssize_t rump___sysimpl_extattr_list_fd(int, int, void *, size_t);
 ssize_t
-rump_sys_extattr_list_fd(int fd, int attrnamespace, void * data, size_t nbytes)
+rump___sysimpl_extattr_list_fd(int fd, int attrnamespace, void * data, size_t nbytes)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2377,9 +2484,9 @@ rump_sys_extattr_list_fd(int fd, int attrnamespace, void * data, size_t nbytes)
 }
 rsys_alias(sys_extattr_list_fd,rump_enosys)
 
-ssize_t rump_sys_extattr_list_file(const char *, int, void *, size_t);
+ssize_t rump___sysimpl_extattr_list_file(const char *, int, void *, size_t);
 ssize_t
-rump_sys_extattr_list_file(const char * path, int attrnamespace, void * data, size_t nbytes)
+rump___sysimpl_extattr_list_file(const char * path, int attrnamespace, void * data, size_t nbytes)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2399,9 +2506,9 @@ rump_sys_extattr_list_file(const char * path, int attrnamespace, void * data, si
 }
 rsys_alias(sys_extattr_list_file,rump_enosys)
 
-ssize_t rump_sys_extattr_list_link(const char *, int, void *, size_t);
+ssize_t rump___sysimpl_extattr_list_link(const char *, int, void *, size_t);
 ssize_t
-rump_sys_extattr_list_link(const char * path, int attrnamespace, void * data, size_t nbytes)
+rump___sysimpl_extattr_list_link(const char * path, int attrnamespace, void * data, size_t nbytes)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2421,9 +2528,31 @@ rump_sys_extattr_list_link(const char * path, int attrnamespace, void * data, si
 }
 rsys_alias(sys_extattr_list_link,rump_enosys)
 
-int rump_sys_setxattr(const char *, const char *, void *, size_t, int);
+int rump___sysimpl_pollts(struct pollfd *, u_int, const struct timespec *, const sigset_t *);
 int
-rump_sys_setxattr(const char * path, const char * name, void * value, size_t size, int flags)
+rump___sysimpl_pollts(struct pollfd * fds, u_int nfds, const struct timespec * ts, const sigset_t * mask)
+{
+	register_t rval[2] = {0, 0};
+	int error = 0;
+	struct compat_50_sys_pollts_args callarg;
+
+	SPARG(&callarg, fds) = fds;
+	SPARG(&callarg, nfds) = nfds;
+	SPARG(&callarg, ts) = (const struct timespec50 *)ts;
+	SPARG(&callarg, mask) = mask;
+
+	error = rsys_syscall(SYS_compat_50_pollts, &callarg, sizeof(callarg), rval);
+	if (error) {
+		rval[0] = -1;
+		rsys_seterrno(error);
+	}
+	return rval[0];
+}
+rsys_alias(compat_50_sys_pollts,rump_enosys)
+
+int rump___sysimpl_setxattr(const char *, const char *, void *, size_t, int);
+int
+rump___sysimpl_setxattr(const char * path, const char * name, void * value, size_t size, int flags)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2444,9 +2573,9 @@ rump_sys_setxattr(const char * path, const char * name, void * value, size_t siz
 }
 rsys_alias(sys_setxattr,rump_enosys)
 
-int rump_sys_lsetxattr(const char *, const char *, void *, size_t, int);
+int rump___sysimpl_lsetxattr(const char *, const char *, void *, size_t, int);
 int
-rump_sys_lsetxattr(const char * path, const char * name, void * value, size_t size, int flags)
+rump___sysimpl_lsetxattr(const char * path, const char * name, void * value, size_t size, int flags)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2467,9 +2596,9 @@ rump_sys_lsetxattr(const char * path, const char * name, void * value, size_t si
 }
 rsys_alias(sys_lsetxattr,rump_enosys)
 
-int rump_sys_fsetxattr(int, const char *, void *, size_t, int);
+int rump___sysimpl_fsetxattr(int, const char *, void *, size_t, int);
 int
-rump_sys_fsetxattr(int fd, const char * name, void * value, size_t size, int flags)
+rump___sysimpl_fsetxattr(int fd, const char * name, void * value, size_t size, int flags)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2490,9 +2619,9 @@ rump_sys_fsetxattr(int fd, const char * name, void * value, size_t size, int fla
 }
 rsys_alias(sys_fsetxattr,rump_enosys)
 
-int rump_sys_getxattr(const char *, const char *, void *, size_t);
+int rump___sysimpl_getxattr(const char *, const char *, void *, size_t);
 int
-rump_sys_getxattr(const char * path, const char * name, void * value, size_t size)
+rump___sysimpl_getxattr(const char * path, const char * name, void * value, size_t size)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2512,9 +2641,9 @@ rump_sys_getxattr(const char * path, const char * name, void * value, size_t siz
 }
 rsys_alias(sys_getxattr,rump_enosys)
 
-int rump_sys_lgetxattr(const char *, const char *, void *, size_t);
+int rump___sysimpl_lgetxattr(const char *, const char *, void *, size_t);
 int
-rump_sys_lgetxattr(const char * path, const char * name, void * value, size_t size)
+rump___sysimpl_lgetxattr(const char * path, const char * name, void * value, size_t size)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2534,9 +2663,9 @@ rump_sys_lgetxattr(const char * path, const char * name, void * value, size_t si
 }
 rsys_alias(sys_lgetxattr,rump_enosys)
 
-int rump_sys_fgetxattr(int, const char *, void *, size_t);
+int rump___sysimpl_fgetxattr(int, const char *, void *, size_t);
 int
-rump_sys_fgetxattr(int fd, const char * name, void * value, size_t size)
+rump___sysimpl_fgetxattr(int fd, const char * name, void * value, size_t size)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2556,9 +2685,9 @@ rump_sys_fgetxattr(int fd, const char * name, void * value, size_t size)
 }
 rsys_alias(sys_fgetxattr,rump_enosys)
 
-int rump_sys_listxattr(const char *, char *, size_t);
+int rump___sysimpl_listxattr(const char *, char *, size_t);
 int
-rump_sys_listxattr(const char * path, char * list, size_t size)
+rump___sysimpl_listxattr(const char * path, char * list, size_t size)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2577,9 +2706,9 @@ rump_sys_listxattr(const char * path, char * list, size_t size)
 }
 rsys_alias(sys_listxattr,rump_enosys)
 
-int rump_sys_llistxattr(const char *, char *, size_t);
+int rump___sysimpl_llistxattr(const char *, char *, size_t);
 int
-rump_sys_llistxattr(const char * path, char * list, size_t size)
+rump___sysimpl_llistxattr(const char * path, char * list, size_t size)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2598,9 +2727,9 @@ rump_sys_llistxattr(const char * path, char * list, size_t size)
 }
 rsys_alias(sys_llistxattr,rump_enosys)
 
-int rump_sys_flistxattr(int, char *, size_t);
+int rump___sysimpl_flistxattr(int, char *, size_t);
 int
-rump_sys_flistxattr(int fd, char * list, size_t size)
+rump___sysimpl_flistxattr(int fd, char * list, size_t size)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2619,9 +2748,9 @@ rump_sys_flistxattr(int fd, char * list, size_t size)
 }
 rsys_alias(sys_flistxattr,rump_enosys)
 
-int rump_sys_removexattr(const char *, const char *);
+int rump___sysimpl_removexattr(const char *, const char *);
 int
-rump_sys_removexattr(const char * path, const char * name)
+rump___sysimpl_removexattr(const char * path, const char * name)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2639,9 +2768,9 @@ rump_sys_removexattr(const char * path, const char * name)
 }
 rsys_alias(sys_removexattr,rump_enosys)
 
-int rump_sys_lremovexattr(const char *, const char *);
+int rump___sysimpl_lremovexattr(const char *, const char *);
 int
-rump_sys_lremovexattr(const char * path, const char * name)
+rump___sysimpl_lremovexattr(const char * path, const char * name)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2659,9 +2788,9 @@ rump_sys_lremovexattr(const char * path, const char * name)
 }
 rsys_alias(sys_lremovexattr,rump_enosys)
 
-int rump_sys_fremovexattr(int, const char *);
+int rump___sysimpl_fremovexattr(int, const char *);
 int
-rump_sys_fremovexattr(int fd, const char * name)
+rump___sysimpl_fremovexattr(int fd, const char * name)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2679,9 +2808,69 @@ rump_sys_fremovexattr(int fd, const char * name)
 }
 rsys_alias(sys_fremovexattr,rump_enosys)
 
-int rump_sys___getdents30(int, char *, size_t);
+int rump___sysimpl_stat30(const char *, struct stat *);
 int
-rump_sys___getdents30(int fd, char * buf, size_t count)
+rump___sysimpl_stat30(const char * path, struct stat * ub)
+{
+	register_t rval[2] = {0, 0};
+	int error = 0;
+	struct compat_50_sys___stat30_args callarg;
+
+	SPARG(&callarg, path) = path;
+	SPARG(&callarg, ub) = (struct stat30 *)ub;
+
+	error = rsys_syscall(SYS_compat_50___stat30, &callarg, sizeof(callarg), rval);
+	if (error) {
+		rval[0] = -1;
+		rsys_seterrno(error);
+	}
+	return rval[0];
+}
+rsys_alias(compat_50_sys___stat30,rump_enosys)
+
+int rump___sysimpl_fstat30(int, struct stat *);
+int
+rump___sysimpl_fstat30(int fd, struct stat * sb)
+{
+	register_t rval[2] = {0, 0};
+	int error = 0;
+	struct compat_50_sys___fstat30_args callarg;
+
+	SPARG(&callarg, fd) = fd;
+	SPARG(&callarg, sb) = (struct stat30 *)sb;
+
+	error = rsys_syscall(SYS_compat_50___fstat30, &callarg, sizeof(callarg), rval);
+	if (error) {
+		rval[0] = -1;
+		rsys_seterrno(error);
+	}
+	return rval[0];
+}
+rsys_alias(compat_50_sys___fstat30,rump_enosys)
+
+int rump___sysimpl_lstat30(const char *, struct stat *);
+int
+rump___sysimpl_lstat30(const char * path, struct stat * ub)
+{
+	register_t rval[2] = {0, 0};
+	int error = 0;
+	struct compat_50_sys___lstat30_args callarg;
+
+	SPARG(&callarg, path) = path;
+	SPARG(&callarg, ub) = (struct stat30 *)ub;
+
+	error = rsys_syscall(SYS_compat_50___lstat30, &callarg, sizeof(callarg), rval);
+	if (error) {
+		rval[0] = -1;
+		rsys_seterrno(error);
+	}
+	return rval[0];
+}
+rsys_alias(compat_50_sys___lstat30,rump_enosys)
+
+int rump___sysimpl_getdents30(int, char *, size_t);
+int
+rump___sysimpl_getdents30(int fd, char * buf, size_t count)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2700,9 +2889,9 @@ rump_sys___getdents30(int fd, char * buf, size_t count)
 }
 rsys_alias(sys___getdents30,rump_enosys)
 
-int rump_sys___socket30(int, int, int);
+int rump___sysimpl_socket30(int, int, int);
 int
-rump_sys___socket30(int domain, int type, int protocol)
+rump___sysimpl_socket30(int domain, int type, int protocol)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2721,9 +2910,9 @@ rump_sys___socket30(int domain, int type, int protocol)
 }
 rsys_alias(sys___socket30,rump_enosys)
 
-int rump_sys___getfh30(const char *, void *, size_t *);
+int rump___sysimpl_getfh30(const char *, void *, size_t *);
 int
-rump_sys___getfh30(const char * fname, void * fhp, size_t * fh_size)
+rump___sysimpl_getfh30(const char * fname, void * fhp, size_t * fh_size)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2742,9 +2931,9 @@ rump_sys___getfh30(const char * fname, void * fhp, size_t * fh_size)
 }
 rsys_alias(sys___getfh30,rump_enosys)
 
-int rump_sys___fhopen40(const void *, size_t, int);
+int rump___sysimpl_fhopen40(const void *, size_t, int);
 int
-rump_sys___fhopen40(const void * fhp, size_t fh_size, int flags)
+rump___sysimpl_fhopen40(const void * fhp, size_t fh_size, int flags)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2763,9 +2952,9 @@ rump_sys___fhopen40(const void * fhp, size_t fh_size, int flags)
 }
 rsys_alias(sys___fhopen40,rump_enosys)
 
-int rump_sys___fhstatvfs140(const void *, size_t, struct statvfs *, int);
+int rump___sysimpl_fhstatvfs140(const void *, size_t, struct statvfs *, int);
 int
-rump_sys___fhstatvfs140(const void * fhp, size_t fh_size, struct statvfs * buf, int flags)
+rump___sysimpl_fhstatvfs140(const void * fhp, size_t fh_size, struct statvfs * buf, int flags)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2785,9 +2974,9 @@ rump_sys___fhstatvfs140(const void * fhp, size_t fh_size, struct statvfs * buf,
 }
 rsys_alias(sys___fhstatvfs140,rump_enosys)
 
-int rump_sys___mount50(const char *, const char *, int, void *, size_t);
+int rump___sysimpl_mount50(const char *, const char *, int, void *, size_t);
 int
-rump_sys___mount50(const char * type, const char * path, int flags, void * data, size_t data_len)
+rump___sysimpl_mount50(const char * type, const char * path, int flags, void * data, size_t data_len)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2808,9 +2997,9 @@ rump_sys___mount50(const char * type, const char * path, int flags, void * data,
 }
 rsys_alias(sys___mount50,rump_enosys)
 
-int rump_sys___posix_fadvise50(int, off_t, off_t, int);
+int rump___sysimpl_posix_fadvise50(int, off_t, off_t, int);
 int
-rump_sys___posix_fadvise50(int fd, off_t offset, off_t len, int advice)
+rump___sysimpl_posix_fadvise50(int fd, off_t offset, off_t len, int advice)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2831,9 +3020,9 @@ rump_sys___posix_fadvise50(int fd, off_t offset, off_t len, int advice)
 }
 rsys_alias(sys___posix_fadvise50,rump_enosys)
 
-int rump_sys___select50(int, fd_set *, fd_set *, fd_set *, struct timeval *);
+int rump___sysimpl_select50(int, fd_set *, fd_set *, fd_set *, struct timeval *);
 int
-rump_sys___select50(int nd, fd_set * in, fd_set * ou, fd_set * ex, struct timeval * tv)
+rump___sysimpl_select50(int nd, fd_set * in, fd_set * ou, fd_set * ex, struct timeval * tv)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2854,9 +3043,9 @@ rump_sys___select50(int nd, fd_set * in, fd_set * ou, fd_set * ex, struct timeva
 }
 rsys_alias(sys___select50,rump_enosys)
 
-int rump_sys___utimes50(const char *, const struct timeval *);
+int rump___sysimpl_utimes50(const char *, const struct timeval *);
 int
-rump_sys___utimes50(const char * path, const struct timeval * tptr)
+rump___sysimpl_utimes50(const char * path, const struct timeval * tptr)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2874,9 +3063,9 @@ rump_sys___utimes50(const char * path, const struct timeval * tptr)
 }
 rsys_alias(sys___utimes50,rump_enosys)
 
-int rump_sys___futimes50(int, const struct timeval *);
+int rump___sysimpl_futimes50(int, const struct timeval *);
 int
-rump_sys___futimes50(int fd, const struct timeval * tptr)
+rump___sysimpl_futimes50(int fd, const struct timeval * tptr)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2894,9 +3083,9 @@ rump_sys___futimes50(int fd, const struct timeval * tptr)
 }
 rsys_alias(sys___futimes50,rump_enosys)
 
-int rump_sys___lutimes50(const char *, const struct timeval *);
+int rump___sysimpl_lutimes50(const char *, const struct timeval *);
 int
-rump_sys___lutimes50(const char * path, const struct timeval * tptr)
+rump___sysimpl_lutimes50(const char * path, const struct timeval * tptr)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2914,9 +3103,9 @@ rump_sys___lutimes50(const char * path, const struct timeval * tptr)
 }
 rsys_alias(sys___lutimes50,rump_enosys)
 
-int rump_sys___kevent50(int, const struct kevent *, size_t, struct kevent *, size_t, const struct timespec *);
+int rump___sysimpl_kevent50(int, const struct kevent *, size_t, struct kevent *, size_t, const struct timespec *);
 int
-rump_sys___kevent50(int fd, const struct kevent * changelist, size_t nchanges, struct kevent * eventlist, size_t nevents, const struct timespec * timeout)
+rump___sysimpl_kevent50(int fd, const struct kevent * changelist, size_t nchanges, struct kevent * eventlist, size_t nevents, const struct timespec * timeout)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2938,9 +3127,9 @@ rump_sys___kevent50(int fd, const struct kevent * changelist, size_t nchanges, s
 }
 rsys_alias(sys___kevent50,rump_enosys)
 
-int rump_sys___pselect50(int, fd_set *, fd_set *, fd_set *, const struct timespec *, const sigset_t *);
+int rump___sysimpl_pselect50(int, fd_set *, fd_set *, fd_set *, const struct timespec *, const sigset_t *);
 int
-rump_sys___pselect50(int nd, fd_set * in, fd_set * ou, fd_set * ex, const struct timespec * ts, const sigset_t * mask)
+rump___sysimpl_pselect50(int nd, fd_set * in, fd_set * ou, fd_set * ex, const struct timespec * ts, const sigset_t * mask)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2962,9 +3151,9 @@ rump_sys___pselect50(int nd, fd_set * in, fd_set * ou, fd_set * ex, const struct
 }
 rsys_alias(sys___pselect50,rump_enosys)
 
-int rump_sys___pollts50(struct pollfd *, u_int, const struct timespec *, const sigset_t *);
+int rump___sysimpl_pollts50(struct pollfd *, u_int, const struct timespec *, const sigset_t *);
 int
-rump_sys___pollts50(struct pollfd * fds, u_int nfds, const struct timespec * ts, const sigset_t * mask)
+rump___sysimpl_pollts50(struct pollfd * fds, u_int nfds, const struct timespec * ts, const sigset_t * mask)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -2984,9 +3173,9 @@ rump_sys___pollts50(struct pollfd * fds, u_int nfds, const struct timespec * ts,
 }
 rsys_alias(sys___pollts50,rump_enosys)
 
-int rump_sys___stat50(const char *, struct stat *);
+int rump___sysimpl_stat50(const char *, struct stat *);
 int
-rump_sys___stat50(const char * path, struct stat * ub)
+rump___sysimpl_stat50(const char * path, struct stat * ub)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -3004,9 +3193,9 @@ rump_sys___stat50(const char * path, struct stat * ub)
 }
 rsys_alias(sys___stat50,rump_enosys)
 
-int rump_sys___fstat50(int, struct stat *);
+int rump___sysimpl_fstat50(int, struct stat *);
 int
-rump_sys___fstat50(int fd, struct stat * sb)
+rump___sysimpl_fstat50(int fd, struct stat * sb)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -3024,9 +3213,9 @@ rump_sys___fstat50(int fd, struct stat * sb)
 }
 rsys_alias(sys___fstat50,rump_enosys)
 
-int rump_sys___lstat50(const char *, struct stat *);
+int rump___sysimpl_lstat50(const char *, struct stat *);
 int
-rump_sys___lstat50(const char * path, struct stat * ub)
+rump___sysimpl_lstat50(const char * path, struct stat * ub)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -3044,9 +3233,9 @@ rump_sys___lstat50(const char * path, struct stat * ub)
 }
 rsys_alias(sys___lstat50,rump_enosys)
 
-int rump_sys___mknod50(const char *, mode_t, dev_t);
+int rump___sysimpl_mknod50(const char *, mode_t, dev_t);
 int
-rump_sys___mknod50(const char * path, mode_t mode, dev_t dev)
+rump___sysimpl_mknod50(const char * path, mode_t mode, dev_t dev)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -3065,9 +3254,9 @@ rump_sys___mknod50(const char * path, mode_t mode, dev_t dev)
 }
 rsys_alias(sys___mknod50,rump_enosys)
 
-int rump_sys___fhstat50(const void *, size_t, struct stat *);
+int rump___sysimpl_fhstat50(const void *, size_t, struct stat *);
 int
-rump_sys___fhstat50(const void * fhp, size_t fh_size, struct stat * sb)
+rump___sysimpl_fhstat50(const void * fhp, size_t fh_size, struct stat * sb)
 {
 	register_t rval[2] = {0, 0};
 	int error = 0;
@@ -3295,8 +3484,8 @@ struct sysent rump_sysent[] = {
 	    (sy_call_t *)rump_enosys },		/* 91 = unimplemented getdopt */
 	{ ns(struct sys_fcntl_args), 0,
 	    (sy_call_t *)sys_fcntl },		/* 92 = fcntl */
-	{ 0, 0, 0,
-	    (sy_call_t *)sys_nomodule }, 	/* 93 = select */
+	{ ns(struct compat_50_sys_select_args), 0,
+	    (sy_call_t *)compat_50_sys_select },/* 93 = compat_50_select */
 	{ 0, 0, SYCALL_NOSYS,
 	    (sy_call_t *)rump_enosys },		/* 94 = unimplemented setdopt */
 	{ ns(struct sys_fsync_args), 0,
@@ -3385,8 +3574,8 @@ struct sysent rump_sysent[] = {
 	    (sy_call_t *)sys_mkdir },		/* 136 = mkdir */
 	{ ns(struct sys_rmdir_args), 0,
 	    (sy_call_t *)sys_rmdir },		/* 137 = rmdir */
-	{ 0, 0, 0,
-	    (sy_call_t *)sys_nomodule }, 	/* 138 = utimes */
+	{ ns(struct compat_50_sys_utimes_args), 0,
+	    (sy_call_t *)compat_50_sys_utimes },/* 138 = compat_50_utimes */
 	{ 0, 0, SYCALL_NOSYS,
 	    (sy_call_t *)rump_enosys },		/* 139 = obsolete 4.2 sigreturn */
 	{ 0, 0, 0,
@@ -3541,8 +3730,8 @@ struct sysent rump_sysent[] = {
 	    (sy_call_t *)rump_enosys }, 	/* 204 = munlock */
 	{ 0, 0, SYCALL_NOSYS,
 	    (sy_call_t *)rump_enosys }, 	/* 205 = undelete */
-	{ 0, 0, 0,
-	    (sy_call_t *)sys_nomodule }, 	/* 206 = futimes */
+	{ ns(struct compat_50_sys_futimes_args), 0,
+	    (sy_call_t *)compat_50_sys_futimes },/* 206 = compat_50_futimes */
 	{ ns(struct sys_getpgid_args), 0,
 	    (sy_call_t *)sys_getpgid },		/* 207 = getpgid */
 	{ ns(struct sys_reboot_args), 0,
@@ -3714,8 +3903,8 @@ struct sysent rump_sysent[] = {
 	    (sy_call_t *)sys_lchmod },		/* 274 = lchmod */
 	{ ns(struct sys_lchown_args), 0,
 	    (sy_call_t *)sys_lchown },		/* 275 = lchown */
-	{ 0, 0, 0,
-	    (sy_call_t *)sys_nomodule }, 	/* 276 = lutimes */
+	{ ns(struct compat_50_sys_lutimes_args), 0,
+	    (sy_call_t *)compat_50_sys_lutimes },/* 276 = compat_50_lutimes */
 	{ 0, 0, SYCALL_NOSYS,
 	    (sy_call_t *)rump_enosys }, 	/* 277 = __msync13 */
 	{ 0, 0, 0,
@@ -3867,8 +4056,8 @@ struct sysent rump_sysent[] = {
 	    (sy_call_t *)rump_enosys }, 	/* 343 = rasctl */
 	{ 0, 0, 0,
 	    (sy_call_t *)sys_kqueue },		/* 344 = kqueue */
-	{ 0, 0, 0,
-	    (sy_call_t *)sys_nomodule }, 	/* 345 = kevent */
+	{ ns(struct compat_50_sys_kevent_args), 0,
+	    (sy_call_t *)compat_50_sys_kevent },/* 345 = compat_50_kevent */
 	{ 0, 0, SYCALL_NOSYS,
 	    (sy_call_t *)rump_enosys }, 	/* 346 = _sched_setparam */
 	{ 0, 0, SYCALL_NOSYS,
@@ -3925,8 +4114,8 @@ struct sysent rump_sysent[] = {
 	    (sy_call_t *)sys_extattr_list_link },/* 372 = extattr_list_link */
 	{ 0, 0, 0,
 	    (sy_call_t *)sys_nomodule }, 	/* 373 = pselect */
-	{ 0, 0, 0,
-	    (sy_call_t *)sys_nomodule }, 	/* 374 = pollts */
+	{ ns(struct compat_50_sys_pollts_args), 0,
+	    (sy_call_t *)compat_50_sys_pollts },/* 374 = compat_50_pollts */
 	{ ns(struct sys_setxattr_args), 0,
 	    (sy_call_t *)sys_setxattr },	/* 375 = setxattr */
 	{ ns(struct sys_lsetxattr_args), 0,
@@ -3951,12 +4140,12 @@ struct sysent rump_sysent[] = {
 	    (sy_call_t *)sys_lremovexattr },	/* 385 = lremovexattr */
 	{ ns(struct sys_fremovexattr_args), 0,
 	    (sy_call_t *)sys_fremovexattr },	/* 386 = fremovexattr */
-	{ 0, 0, 0,
-	    (sy_call_t *)sys_nomodule }, 	/* 387 = __stat30 */
-	{ 0, 0, 0,
-	    (sy_call_t *)sys_nomodule }, 	/* 388 = __fstat30 */
-	{ 0, 0, 0,
-	    (sy_call_t *)sys_nomodule }, 	/* 389 = __lstat30 */
+	{ ns(struct compat_50_sys___stat30_args), 0,
+	    (sy_call_t *)compat_50_sys___stat30 },/* 387 = compat_50___stat30 */
+	{ ns(struct compat_50_sys___fstat30_args), 0,
+	    (sy_call_t *)compat_50_sys___fstat30 },/* 388 = compat_50___fstat30 */
+	{ ns(struct compat_50_sys___lstat30_args), 0,
+	    (sy_call_t *)compat_50_sys___lstat30 },/* 389 = compat_50___lstat30 */
 	{ ns(struct sys___getdents30_args), 0,
 	    (sy_call_t *)sys___getdents30 },	/* 390 = __getdents30 */
 	{ 0, 0, SYCALL_NOSYS,