diff --git a/sys/rump/include/rump/rumpkern_if_pub.h b/sys/rump/include/rump/rumpkern_if_pub.h
index bb5e6c28c8e8..64d286e30958 100644
--- a/sys/rump/include/rump/rumpkern_if_pub.h
+++ b/sys/rump/include/rump/rumpkern_if_pub.h
@@ -1,8 +1,8 @@
-/*	$NetBSD: rumpkern_if_pub.h,v 1.9 2010/09/01 19:33:04 pooka Exp $	*/
+/*	$NetBSD: rumpkern_if_pub.h,v 1.10 2010/10/27 20:35:47 pooka Exp $	*/
 
 /*
  * Automatically generated.  DO NOT EDIT.
- * from: NetBSD: rumpkern.ifspec,v 1.6 2010/09/01 19:13:38 pooka Exp 
+ * from: NetBSD: rumpkern.ifspec,v 1.7 2010/10/27 20:34:50 pooka Exp 
  * by:   NetBSD: makerumpif.sh,v 1.5 2010/09/01 19:32:11 pooka Exp 
  */
 
@@ -23,6 +23,4 @@ void rump_pub_lwproc_switch(struct lwp *);
 void rump_pub_lwproc_releaselwp(void);
 struct lwp * rump_pub_lwproc_curlwp(void);
 void rump_pub_allbetsareoff_setid(pid_t, int);
-int rump_pub_sysproxy_set(rump_sysproxy_t, void *);
-int rump_pub_sysproxy_socket_setup_client(int);
-int rump_pub_sysproxy_socket_setup_server(int);
+int rump_pub_syscall(int, void *, register_t *);
diff --git a/sys/rump/librump/rumpkern/rumpkern_if_priv.h b/sys/rump/librump/rumpkern/rumpkern_if_priv.h
index 57fa7cafef04..f02cc0299959 100644
--- a/sys/rump/librump/rumpkern/rumpkern_if_priv.h
+++ b/sys/rump/librump/rumpkern/rumpkern_if_priv.h
@@ -1,8 +1,8 @@
-/*	$NetBSD: rumpkern_if_priv.h,v 1.8 2010/09/01 19:33:05 pooka Exp $	*/
+/*	$NetBSD: rumpkern_if_priv.h,v 1.9 2010/10/27 20:35:47 pooka Exp $	*/
 
 /*
  * Automatically generated.  DO NOT EDIT.
- * from: NetBSD: rumpkern.ifspec,v 1.6 2010/09/01 19:13:38 pooka Exp 
+ * from: NetBSD: rumpkern.ifspec,v 1.7 2010/10/27 20:34:50 pooka Exp 
  * by:   NetBSD: makerumpif.sh,v 1.5 2010/09/01 19:32:11 pooka Exp 
  */
 
@@ -23,6 +23,4 @@ void rump_lwproc_switch(struct lwp *);
 void rump_lwproc_releaselwp(void);
 struct lwp * rump_lwproc_curlwp(void);
 void rump_allbetsareoff_setid(pid_t, int);
-int rump_sysproxy_set(rump_sysproxy_t, void *);
-int rump_sysproxy_socket_setup_client(int);
-int rump_sysproxy_socket_setup_server(int);
+int rump_syscall(int, void *, register_t *);
diff --git a/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c b/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c
index d9763892d2a5..bf81215b8912 100644
--- a/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c
+++ b/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c
@@ -1,8 +1,8 @@
-/*	$NetBSD: rumpkern_if_wrappers.c,v 1.8 2010/09/01 19:33:05 pooka Exp $	*/
+/*	$NetBSD: rumpkern_if_wrappers.c,v 1.9 2010/10/27 20:35:47 pooka Exp $	*/
 
 /*
  * Automatically generated.  DO NOT EDIT.
- * from: NetBSD: rumpkern.ifspec,v 1.6 2010/09/01 19:13:38 pooka Exp 
+ * from: NetBSD: rumpkern.ifspec,v 1.7 2010/10/27 20:34:50 pooka Exp 
  * by:   NetBSD: makerumpif.sh,v 1.5 2010/09/01 19:32:11 pooka Exp 
  */
 
@@ -213,36 +213,12 @@ rump_pub_allbetsareoff_setid(pid_t arg1, int arg2)
 }
 
 int
-rump_pub_sysproxy_set(rump_sysproxy_t arg1, void *arg2)
+rump_pub_syscall(int arg1, void *arg2, register_t *arg3)
 {
 	int rv;
 
 	rump_schedule();
-	rv = rump_sysproxy_set(arg1, arg2);
-	rump_unschedule();
-
-	return rv;
-}
-
-int
-rump_pub_sysproxy_socket_setup_client(int arg1)
-{
-	int rv;
-
-	rump_schedule();
-	rv = rump_sysproxy_socket_setup_client(arg1);
-	rump_unschedule();
-
-	return rv;
-}
-
-int
-rump_pub_sysproxy_socket_setup_server(int arg1)
-{
-	int rv;
-
-	rump_schedule();
-	rv = rump_sysproxy_socket_setup_server(arg1);
+	rv = rump_syscall(arg1, arg2, arg3);
 	rump_unschedule();
 
 	return rv;