diff -NurpP --minimal ./util-vserver-0.30.208-fix03/configure ./util-vserver-0.30.208-fix04/configure
--- ./util-vserver-0.30.208-fix03/configure	2005-07-15 22:25:27.000000000 +0200
+++ ./util-vserver-0.30.208-fix04/configure	2005-10-27 15:01:03.000000000 +0200
@@ -26279,7 +26279,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 		cat >conftest.$ac_ext <<_ACEOF
 
+#if (ENSC_MARK == alternative)
+#include <vserver-syscall-def.h>
+#else
 #include <asm/unistd.h>
+#endif
 #ifdef __NR_vserver
 ensc_syscall_tmp_nr=__NR_vserver;
 ensc_syscall_tmp_src=ENSC_MARK
@@ -26289,6 +26293,8 @@ _ACEOF
 		ensc_syscall_tmp_nr=
 		ensc_syscall_tmp_src=
 		test "$ensc_syscall_tmp_nr" || \
+			eval $($CPP $CPPFLAGS -D ENSC_MARK='alternative' -Ilib			   conftest.c | $EGREP '^ensc_syscall_tmp_(nr=[1-9][0-9]*;|src=.*)$')
+		test "$ensc_syscall_tmp_nr" || \
 			eval $($CPP $CPPFLAGS -D ENSC_MARK='glibc'                                 conftest.c | $EGREP '^ensc_syscall_tmp_(nr=[1-9][0-9]*;|src=.*)$')
 		test "$ensc_syscall_tmp_nr" || \
 			eval $($CPP $CPPFLAGS -D ENSC_MARK='kernel' -I $ensc_cv_path_kernelheaders conftest.c | $EGREP '^ensc_syscall_tmp_(nr=[1-9][0-9]*;|src=.*)$')
@@ -26417,7 +26423,7 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ensc_cv_test_syscall=traditional
+ensc_cv_test_syscall=alternative
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
diff -NurpP --minimal ./util-vserver-0.30.208-fix03/lib/syscall-wrap.h ./util-vserver-0.30.208-fix04/lib/syscall-wrap.h
--- ./util-vserver-0.30.208-fix03/lib/syscall-wrap.h	2005-05-02 23:42:05.000000000 +0200
+++ ./util-vserver-0.30.208-fix04/lib/syscall-wrap.h	2005-10-27 15:01:44.000000000 +0200
@@ -19,11 +19,8 @@
 #ifndef H_UTIL_VSERVER_LIB_SYSCALL_WRAP_H
 #define H_UTIL_VSERVER_LIB_SYSCALL_WRAP_H
 
-#include <sys/syscall.h>
-#include <syscall.h>
-#include <unistd.h>
-
 #ifdef ENSC_USE_ALTERNATIVE_SYSCALL_MACROS
+
 #  undef _syscall0
 #  undef _syscall1
 #  undef _syscall2
@@ -34,6 +31,12 @@
 #  undef _syscall7
 
 #  include "syscall-alternative.h"
+#  include "vserver-syscall-def.h"
+#else
+
+#  include <sys/syscall.h>
+#  include <syscall.h>
+#  include <unistd.h>
 #endif
 
 #endif	//  H_UTIL_VSERVER_LIB_SYSCALL_WRAP_H
diff -NurpP --minimal ./util-vserver-0.30.208-fix03/lib/vserver-internal.h ./util-vserver-0.30.208-fix04/lib/vserver-internal.h
--- ./util-vserver-0.30.208-fix03/lib/vserver-internal.h	2005-05-02 23:42:37.000000000 +0200
+++ ./util-vserver-0.30.208-fix04/lib/vserver-internal.h	2005-10-27 15:01:44.000000000 +0200
@@ -242,9 +242,7 @@ int vserver(uint32_t cmd, uint32_t id, v
   return syscall(__NR_vserver, cmd, id, data);
 }
 #else
-inline static UNUSED ALWAYSINLINE
-_syscall3(int, vserver,
-	  uint32_t, cmd, uint32_t, id, void *, data)
+#include "vserver-syscall-def.h"
 #endif
 #endif
 
diff -NurpP --minimal ./util-vserver-0.30.208-fix03/lib/vserver-syscall-def.h ./util-vserver-0.30.208-fix04/lib/vserver-syscall-def.h
--- ./util-vserver-0.30.208-fix03/lib/vserver-syscall-def.h	1970-01-01 01:00:00.000000000 +0100
+++ ./util-vserver-0.30.208-fix04/lib/vserver-syscall-def.h	2005-10-27 15:01:44.000000000 +0200
@@ -0,0 +1,48 @@
+
+#include <stdint.h>
+
+#if 	defined(__alpha__)
+#define __NR_vserver	428
+#elif	defined(__arm__)
+#define __NR_vserver	313
+#elif	defined(__cris__)
+#define __NR_vserver	273
+#elif	defined(__frv__)
+#define __NR_vserver	273
+#elif	defined(__h8300__)
+#define __NR_vserver	273
+#elif	defined(__i386__)
+#define __NR_vserver	273
+#elif	defined(__ia64__)
+#define __NR_vserver	1269
+#elif	defined(__m32r__)
+#define __NR_vserver	*
+#elif	defined(__mc68000__)
+#define __NR_vserver	278
+#elif	defined(__mips__) && (_MIPS_SIM == _MIPS_SIM_ABI32)
+#define __NR_vserver	277
+#elif	defined(__mips__) && (_MIPS_SIM == _MIPS_SIM_ABI64)
+#define __NR_vserver	240
+#elif	defined(__mips__) && (_MIPS_SIM == _MIPS_SIM_NABI32)
+#define __NR_vserver	236
+#elif	defined(__hppa__)
+#define __NR_vserver	*
+#elif	defined(__powerpc__)
+#define __NR_vserver	257
+#elif	defined(__s390__)
+#define __NR_vserver	263
+#elif	defined(__sh__)
+#define __NR_vserver	273
+#elif	defined(__sparc__)
+#define __NR_vserver	267
+#elif	defined(__v850__)
+#define __NR_vserver	*
+#elif	defined(__x86_64__)
+#define __NR_vserver	236
+#endif
+
+#ifdef _syscall3
+static inline 
+_syscall3(int, vserver, uint32_t, cmd, uint32_t, id, void *, data);
+#endif
+