diff --git a/alpha.m4 b/alpha.m4
index e135257..e57a6f2 100644
--- a/alpha.m4
+++ b/alpha.m4
@@ -413,15 +413,15 @@
 sys_set_tid_address
 sys_restart_syscall
 sys_fadvise64
-sys_timer_create
-sys_timer_settime
-sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_delete
-sys_clock_settime
-sys_clock_gettime
-sys_clock_getres
-sys_clock_nanosleep
+timer_create
+timer_settime
+timer_gettime
+timer_getoverrun
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 sys_semtimedop
 sys_tgkill
 sys_stat64
@@ -498,7 +498,7 @@
 sys_prlimit64
 sys_name_to_handle_at
 open_by_handle_at
-sys_clock_adjtime
+clock_adjtime
 sys_syncfs
 sys_setns
 sys_accept4
diff --git a/amd64.m4 b/amd64.m4
index 5026094..ba20215 100644
--- a/amd64.m4
+++ b/amd64.m4
@@ -221,15 +221,15 @@
 sys_restart_syscall
 sys_semtimedop
 sys_fadvise64
-sys_timer_create
-sys_timer_settime
-sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_delete
-sys_clock_settime
-sys_clock_gettime
-sys_clock_getres
-sys_clock_nanosleep
+timer_create
+timer_settime
+timer_gettime
+timer_getoverrun
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 sys_exit_group
 sys_epoll_wait
 sys_epoll_ctl
@@ -304,7 +304,7 @@
 sys_prlimit64
 sys_name_to_handle_at
 open_by_handle_at
-sys_clock_adjtime
+clock_adjtime
 sys_syncfs
 sys_sendmmsg
 sys_setns
diff --git a/arm-C.m4 b/arm-C.m4
index 470bfda..7729e3d 100644
--- a/arm-C.m4
+++ b/arm-C.m4
@@ -256,15 +256,15 @@
 sys_ni_syscall
 sys_ni_syscall
 sys_set_tid_address
-compat_sys_timer_create
-compat_sys_timer_settime
-compat_sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_delete
-compat_sys_clock_settime
-compat_sys_clock_gettime
-compat_sys_clock_getres
-compat_sys_clock_nanosleep
+timer_create
+timer_settime
+timer_gettime
+timer_getoverrun
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 compat_sys_statfs64_wrapper
 compat_sys_fstatfs64_wrapper
 sys_tgkill
@@ -371,5 +371,5 @@
 sys_prlimit64
 sys_name_to_handle_at
 open_by_handle_at
-sys_clock_adjtime
+BUG(sys_clock_adjtime,	should be compat_sys_clock_adjtime)
 sys_syncfs
diff --git a/arm.m4 b/arm.m4
index 945ea72..bc333b2 100644
--- a/arm.m4
+++ b/arm.m4
@@ -256,15 +256,15 @@
 sys_ni_syscall
 sys_ni_syscall
 sys_set_tid_address
-sys_timer_create
-sys_timer_settime
-sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_delete
-sys_clock_settime
-sys_clock_gettime
-sys_clock_getres
-sys_clock_nanosleep
+timer_create
+timer_settime
+timer_gettime
+timer_getoverrun
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 sys_statfs64_wrapper
 sys_fstatfs64_wrapper
 sys_tgkill
@@ -371,7 +371,7 @@
 sys_prlimit64
 sys_name_to_handle_at
 open_by_handle_at
-sys_clock_adjtime
+clock_adjtime
 sys_syncfs
 sys_sendmmsg
 sys_setns
diff --git a/arm64.m4 b/arm64.m4
index 32993e0..1b6ac78 100644
--- a/arm64.m4
+++ b/arm64.m4
@@ -106,15 +106,15 @@
 sys_kexec_load
 sys_init_module
 sys_delete_module
-sys_timer_create
-sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_settime
-sys_timer_delete
-sys_clock_settime
-sys_clock_gettime
-sys_clock_getres
-sys_clock_nanosleep
+timer_create
+timer_gettime
+timer_getoverrun
+timer_settime
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 sys_syslog
 sys_ptrace
 sched_setparam
@@ -249,7 +249,7 @@
 sys_fanotify_mark
 sys_name_to_handle_at
 open_by_handle_at
-sys_clock_adjtime
+clock_adjtime
 sys_syncfs
 sys_setns
 sys_sendmmsg
diff --git a/avr32.m4 b/avr32.m4
index dec3fae..7d4fca1 100644
--- a/avr32.m4
+++ b/avr32.m4
@@ -209,15 +209,15 @@
 sys_epoll_wait
 sys_remap_file_pages
 sys_set_tid_address
-sys_timer_create
-sys_timer_settime
-sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_delete
-sys_clock_settime
-sys_clock_gettime
-sys_clock_getres
-sys_clock_nanosleep
+timer_create
+timer_settime
+timer_gettime
+timer_getoverrun
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 sys_statfs64
 sys_fstatfs64
 sys_tgkill
diff --git a/blackfin.m4 b/blackfin.m4
index cf760b4..8895247 100644
--- a/blackfin.m4
+++ b/blackfin.m4
@@ -259,15 +259,15 @@
 sys_epoll_wait
 sys_ni_syscall
 sys_set_tid_address
-sys_timer_create
-sys_timer_settime
-sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_delete
-sys_clock_settime
-sys_clock_gettime
-sys_clock_getres
-sys_clock_nanosleep
+timer_create
+timer_settime
+timer_gettime
+timer_getoverrun
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 sys_statfs64
 sys_fstatfs64
 sys_tgkill
@@ -376,7 +376,7 @@
 sys_cacheflush
 sys_name_to_handle_at
 open_by_handle_at
-sys_clock_adjtime
+clock_adjtime
 sys_syncfs
 sys_setns
 sys_sendmmsg
diff --git a/c6x.m4 b/c6x.m4
index 1ea1912..988722c 100644
--- a/c6x.m4
+++ b/c6x.m4
@@ -106,15 +106,15 @@
 sys_kexec_load
 sys_init_module
 sys_delete_module
-sys_timer_create
-sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_settime
-sys_timer_delete
-sys_clock_settime
-sys_clock_gettime
-sys_clock_getres
-sys_clock_nanosleep
+timer_create
+timer_gettime
+timer_getoverrun
+timer_settime
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 sys_syslog
 sys_ptrace
 sched_setparam
@@ -249,7 +249,7 @@
 sys_fanotify_mark
 sys_name_to_handle_at
 open_by_handle_at
-sys_clock_adjtime
+clock_adjtime
 sys_syncfs
 sys_setns
 sys_sendmmsg
diff --git a/calls b/calls
index 74d5188..230171e 100644
--- a/calls
+++ b/calls
@@ -72,3 +72,14 @@
 timelike(sched_rr_get_interval)
 #
 timelike(nanosleep)
+# 	posix timers
+compat(timer_create)
+timelike(timer_gettime)
+all(timer_getoverrun)
+timelike(timer_settime)
+all(timer_delete)
+timelike(clock_settime)
+timelike(clock_gettime)
+compat(clock_adjtime)	# fucked on x32, badly.  struct timex is vile...
+timelike(clock_getres)
+timelike(clock_nanosleep)
diff --git a/cris.m4 b/cris.m4
index 3b45927..24909c8 100644
--- a/cris.m4
+++ b/cris.m4
@@ -258,15 +258,15 @@
 sys_epoll_wait
 sys_remap_file_pages
 sys_set_tid_address
-sys_timer_create
-sys_timer_settime
-sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_delete
-sys_clock_settime
-sys_clock_gettime
-sys_clock_getres
-sys_clock_nanosleep
+timer_create
+timer_settime
+timer_gettime
+timer_getoverrun
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 sys_statfs64
 sys_fstatfs64
 sys_tgkill
diff --git a/frv.m4 b/frv.m4
index 7179f95..83cc720 100644
--- a/frv.m4
+++ b/frv.m4
@@ -258,15 +258,15 @@
 sys_epoll_wait
 sys_remap_file_pages
 sys_set_tid_address
-sys_timer_create
-sys_timer_settime
-sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_delete
-sys_clock_settime
-sys_clock_gettime
-sys_clock_getres
-sys_clock_nanosleep
+timer_create
+timer_settime
+timer_gettime
+timer_getoverrun
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 sys_statfs64
 sys_fstatfs64
 sys_tgkill
diff --git a/h8300.m4 b/h8300.m4
index 1a7bfe1..95844d9 100644
--- a/h8300.m4
+++ b/h8300.m4
@@ -258,15 +258,15 @@
 sys_epoll_wait
 sys_ni_syscall
 sys_set_tid_address
-sys_timer_create
-sys_timer_settime
-sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_delete
-sys_clock_settime
-sys_clock_gettime
-sys_clock_getres
-sys_clock_nanosleep
+timer_create
+timer_settime
+timer_gettime
+timer_getoverrun
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 sys_statfs64
 sys_fstatfs64
 sys_tgkill
diff --git a/hexagon.m4 b/hexagon.m4
index 63cc8a5..c0d1c1f 100644
--- a/hexagon.m4
+++ b/hexagon.m4
@@ -106,15 +106,15 @@
 sys_kexec_load
 sys_init_module
 sys_delete_module
-sys_timer_create
-sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_settime
-sys_timer_delete
-sys_clock_settime
-sys_clock_gettime
-sys_clock_getres
-sys_clock_nanosleep
+timer_create
+timer_gettime
+timer_getoverrun
+timer_settime
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 sys_syslog
 sys_ptrace
 sched_setparam
@@ -249,7 +249,7 @@
 sys_fanotify_mark
 sys_name_to_handle_at
 open_by_handle_at
-sys_clock_adjtime
+clock_adjtime
 sys_syncfs
 sys_setns
 sys_sendmmsg
diff --git a/i386.m4 b/i386.m4
index 13be2d8..ce08c3d 100644
--- a/i386.m4
+++ b/i386.m4
@@ -238,15 +238,15 @@
 sys_epoll_wait
 sys_remap_file_pages
 sys_set_tid_address
-sys_timer_create
-sys_timer_settime
-sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_delete
-sys_clock_settime
-sys_clock_gettime
-sys_clock_getres
-sys_clock_nanosleep
+timer_create
+timer_settime
+timer_gettime
+timer_getoverrun
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 sys_statfs64
 sys_fstatfs64
 sys_tgkill
@@ -320,7 +320,7 @@
 sys_prlimit64
 sys_name_to_handle_at
 open_by_handle_at
-sys_clock_adjtime
+clock_adjtime
 sys_syncfs
 sys_sendmmsg
 sys_setns
diff --git a/ia64.m4 b/ia64.m4
index e3c80b5..c0737fd 100644
--- a/ia64.m4
+++ b/ia64.m4
@@ -223,15 +223,15 @@
 sys_epoll_wait
 sys_restart_syscall
 sys_semtimedop
-sys_timer_create
-sys_timer_settime
-sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_delete
-sys_clock_settime
-sys_clock_gettime
-sys_clock_getres
-sys_clock_nanosleep
+timer_create
+timer_settime
+timer_gettime
+timer_getoverrun
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 sys_fstatfs64
 sys_statfs64
 sys_mbind
@@ -303,7 +303,7 @@
 sys_prlimit64
 sys_name_to_handle_at
 open_by_handle_at
-sys_clock_adjtime
+clock_adjtime
 sys_syncfs
 sys_setns
 sys_sendmmsg
diff --git a/m32r.m4 b/m32r.m4
index 132271e..416fad2 100644
--- a/m32r.m4
+++ b/m32r.m4
@@ -258,15 +258,15 @@
 sys_epoll_wait
 sys_remap_file_pages
 sys_set_tid_address
-sys_timer_create
-sys_timer_settime
-sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_delete
-sys_clock_settime
-sys_clock_gettime
-sys_clock_getres
-sys_clock_nanosleep
+timer_create
+timer_settime
+timer_gettime
+timer_getoverrun
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 sys_statfs64
 sys_fstatfs64
 sys_tgkill
diff --git a/m68k.m4 b/m68k.m4
index d2e6012..47b5187 100644
--- a/m68k.m4
+++ b/m68k.m4
@@ -253,15 +253,15 @@
 sys_epoll_wait
 sys_remap_file_pages
 sys_set_tid_address
-sys_timer_create
-sys_timer_settime
-sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_delete
-sys_clock_settime
-sys_clock_gettime
-sys_clock_getres
-sys_clock_nanosleep
+timer_create
+timer_settime
+timer_gettime
+timer_getoverrun
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 sys_statfs64
 sys_fstatfs64
 sys_tgkill
@@ -341,7 +341,7 @@
 sys_prlimit64
 sys_name_to_handle_at
 open_by_handle_at
-sys_clock_adjtime
+clock_adjtime
 sys_syncfs
 sys_setns
 sys_process_vm_readv
diff --git a/microblaze.m4 b/microblaze.m4
index 9089bdd..d5b2cad 100644
--- a/microblaze.m4
+++ b/microblaze.m4
@@ -258,15 +258,15 @@
 sys_epoll_wait
 sys_remap_file_pages
 sys_set_tid_address
-sys_timer_create
-sys_timer_settime
-sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_delete
-sys_clock_settime
-sys_clock_gettime
-sys_clock_getres
-sys_clock_nanosleep
+timer_create
+timer_settime
+timer_gettime
+timer_getoverrun
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 sys_statfs64
 sys_fstatfs64
 sys_tgkill
@@ -372,7 +372,7 @@
 sys_prlimit64
 sys_name_to_handle_at
 open_by_handle_at
-sys_clock_adjtime
+clock_adjtime
 sys_syncfs
 sys_setns
 sys_sendmmsg
diff --git a/mips-C.m4 b/mips-C.m4
index afe755e..121b4fa 100644
--- a/mips-C.m4
+++ b/mips-C.m4
@@ -256,15 +256,15 @@
 sys32_fadvise64_64
 compat_sys_statfs64
 compat_sys_fstatfs64
-compat_sys_timer_create
-compat_sys_timer_settime
-compat_sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_delete
-compat_sys_clock_settime
-compat_sys_clock_gettime
-compat_sys_clock_getres
-compat_sys_clock_nanosleep
+timer_create
+timer_settime
+timer_gettime
+timer_getoverrun
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 sys_tgkill
 utimes
 sys_ni_syscall
@@ -340,7 +340,7 @@
 sys_prlimit64
 sys_name_to_handle_at
 open_by_handle_at
-compat_sys_clock_adjtime
+clock_adjtime
 sys_syncfs
 compat_sys_sendmmsg
 sys_setns
diff --git a/mips-n32.m4 b/mips-n32.m4
index fa00b08..841dc05 100644
--- a/mips-n32.m4
+++ b/mips-n32.m4
@@ -219,15 +219,15 @@
 compat_sys_statfs64
 compat_sys_fstatfs64
 sys_sendfile64
-compat_sys_timer_create
-compat_sys_timer_settime
-compat_sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_delete
-compat_sys_clock_settime
-compat_sys_clock_gettime
-compat_sys_clock_getres
-compat_sys_clock_nanosleep
+timer_create
+timer_settime
+timer_gettime
+timer_getoverrun
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 sys_tgkill
 utimes
 sys_ni_syscall
@@ -304,7 +304,7 @@
 sys_prlimit64
 sys_name_to_handle_at
 open_by_handle_at
-compat_sys_clock_adjtime
+clock_adjtime
 sys_syncfs
 compat_sys_sendmmsg
 sys_setns
diff --git a/mips32.m4 b/mips32.m4
index 524d237..baf60ca 100644
--- a/mips32.m4
+++ b/mips32.m4
@@ -256,15 +256,15 @@
 sys_fadvise64_64
 sys_statfs64
 sys_fstatfs64
-sys_timer_create
-sys_timer_settime
-sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_delete
-sys_clock_settime
-sys_clock_gettime
-sys_clock_getres
-sys_clock_nanosleep
+timer_create
+timer_settime
+timer_gettime
+timer_getoverrun
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 sys_tgkill
 utimes
 sys_mbind
@@ -340,7 +340,7 @@
 sys_prlimit64
 sys_name_to_handle_at
 open_by_handle_at
-sys_clock_adjtime
+clock_adjtime
 sys_syncfs
 sys_sendmmsg
 sys_setns
diff --git a/mips64.m4 b/mips64.m4
index 13eea75..0b88f31 100644
--- a/mips64.m4
+++ b/mips64.m4
@@ -215,15 +215,15 @@
 sys_restart_syscall
 sys_semtimedop
 sys_fadvise64_64
-sys_timer_create
-sys_timer_settime
-sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_delete
-sys_clock_settime
-sys_clock_gettime
-sys_clock_getres
-sys_clock_nanosleep
+timer_create
+timer_settime
+timer_gettime
+timer_getoverrun
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 sys_tgkill
 utimes
 sys_mbind
@@ -299,7 +299,7 @@
 sys_prlimit64
 sys_name_to_handle_at
 open_by_handle_at
-sys_clock_adjtime
+clock_adjtime
 sys_syncfs
 sys_sendmmsg
 sys_setns
diff --git a/mn10300.m4 b/mn10300.m4
index 66cf78c..3a3b4f4 100644
--- a/mn10300.m4
+++ b/mn10300.m4
@@ -258,15 +258,15 @@
 sys_epoll_wait
 sys_remap_file_pages
 sys_set_tid_address
-sys_timer_create
-sys_timer_settime
-sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_delete
-sys_clock_settime
-sys_clock_gettime
-sys_clock_getres
-sys_clock_nanosleep
+timer_create
+timer_settime
+timer_gettime
+timer_getoverrun
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 sys_statfs64
 sys_fstatfs64
 sys_tgkill
diff --git a/openrisc.m4 b/openrisc.m4
index b9209ba..b2a37cf 100644
--- a/openrisc.m4
+++ b/openrisc.m4
@@ -106,15 +106,15 @@
 sys_kexec_load
 sys_init_module
 sys_delete_module
-sys_timer_create
-sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_settime
-sys_timer_delete
-sys_clock_settime
-sys_clock_gettime
-sys_clock_getres
-sys_clock_nanosleep
+timer_create
+timer_gettime
+timer_getoverrun
+timer_settime
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 sys_syslog
 sys_ptrace
 sched_setparam
@@ -249,7 +249,7 @@
 sys_fanotify_mark
 sys_name_to_handle_at
 open_by_handle_at
-sys_clock_adjtime
+clock_adjtime
 sys_syncfs
 sys_setns
 sys_sendmmsg
diff --git a/parisc-C.m4 b/parisc-C.m4
index c778215..78fc1fc 100644
--- a/parisc-C.m4
+++ b/parisc-C.m4
@@ -249,15 +249,15 @@
 removexattr
 lremovexattr
 fremovexattr
-compat_sys_timer_create
-compat_sys_timer_settime
-compat_sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_delete
-compat_sys_clock_settime
-compat_sys_clock_gettime
-compat_sys_clock_getres
-compat_sys_clock_nanosleep
+timer_create
+timer_settime
+timer_gettime
+timer_getoverrun
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 sys_tgkill
 compat_sys_mbind
 compat_sys_get_mempolicy
@@ -323,7 +323,7 @@
 sys_prlimit64
 sys_fanotify_init
 compat_sys_fanotify_mark
-compat_sys_clock_adjtime
+clock_adjtime
 sys_name_to_handle_at
 open_by_handle_at
 sys_syncfs
diff --git a/parisc32.m4 b/parisc32.m4
index 9f829cc..be84329 100644
--- a/parisc32.m4
+++ b/parisc32.m4
@@ -249,15 +249,15 @@
 removexattr
 lremovexattr
 fremovexattr
-sys_timer_create
-sys_timer_settime
-sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_delete
-sys_clock_settime
-sys_clock_gettime
-sys_clock_getres
-sys_clock_nanosleep
+timer_create
+timer_settime
+timer_gettime
+timer_getoverrun
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 sys_tgkill
 sys_mbind
 sys_get_mempolicy
@@ -323,7 +323,7 @@
 sys_prlimit64
 sys_fanotify_init
 sys_fanotify_mark
-sys_clock_adjtime
+clock_adjtime
 sys_name_to_handle_at
 open_by_handle_at
 sys_syncfs
diff --git a/parisc64.m4 b/parisc64.m4
index 247607b..4bed032 100644
--- a/parisc64.m4
+++ b/parisc64.m4
@@ -249,15 +249,15 @@
 removexattr
 lremovexattr
 fremovexattr
-sys_timer_create
-sys_timer_settime
-sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_delete
-sys_clock_settime
-sys_clock_gettime
-sys_clock_getres
-sys_clock_nanosleep
+timer_create
+timer_settime
+timer_gettime
+timer_getoverrun
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 sys_tgkill
 sys_mbind
 sys_get_mempolicy
@@ -323,7 +323,7 @@
 sys_prlimit64
 sys_fanotify_init
 sys_fanotify_mark
-sys_clock_adjtime
+clock_adjtime
 sys_name_to_handle_at
 open_by_handle_at
 sys_syncfs
diff --git a/powerpc-C.m4 b/powerpc-C.m4
index fdd8cf5..3fbdbc6 100644
--- a/powerpc-C.m4
+++ b/powerpc-C.m4
@@ -239,15 +239,15 @@
 sys_epoll_ctl
 sys_epoll_wait
 sys_remap_file_pages
-compat_sys_timer_create
-compat_sys_timer_settime
-compat_sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_delete
-compat_sys_clock_settime
-compat_sys_clock_gettime
-compat_sys_clock_getres
-compat_sys_clock_nanosleep
+timer_create
+timer_settime
+timer_gettime
+timer_getoverrun
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 ppc32_swapcontext
 sys_tgkill
 utimes
@@ -346,7 +346,7 @@
 sys_accept4
 sys_name_to_handle_at
 open_by_handle_at
-compat_sys_clock_adjtime
+clock_adjtime
 sys_syncfs
 compat_sys_sendmmsg
 sys_setns
diff --git a/powerpc32.m4 b/powerpc32.m4
index 208c32d..9c9e833 100644
--- a/powerpc32.m4
+++ b/powerpc32.m4
@@ -239,15 +239,15 @@
 sys_epoll_ctl
 sys_epoll_wait
 sys_remap_file_pages
-sys_timer_create
-sys_timer_settime
-sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_delete
-sys_clock_settime
-sys_clock_gettime
-sys_clock_getres
-sys_clock_nanosleep
+timer_create
+timer_settime
+timer_gettime
+timer_getoverrun
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 ppc64_swapcontext
 sys_tgkill
 utimes
@@ -346,7 +346,7 @@
 sys_accept4
 sys_name_to_handle_at
 open_by_handle_at
-sys_clock_adjtime
+clock_adjtime
 sys_syncfs
 sys_sendmmsg
 sys_setns
diff --git a/powerpc64.m4 b/powerpc64.m4
index 3586545..39ef9b8 100644
--- a/powerpc64.m4
+++ b/powerpc64.m4
@@ -239,15 +239,15 @@
 sys_epoll_ctl
 sys_epoll_wait
 sys_remap_file_pages
-sys_timer_create
-sys_timer_settime
-sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_delete
-sys_clock_settime
-sys_clock_gettime
-sys_clock_getres
-sys_clock_nanosleep
+timer_create
+timer_settime
+timer_gettime
+timer_getoverrun
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 ppc_swapcontext
 sys_tgkill
 utimes
@@ -346,7 +346,7 @@
 sys_accept4
 sys_name_to_handle_at
 open_by_handle_at
-sys_clock_adjtime
+clock_adjtime
 sys_syncfs
 sys_sendmmsg
 sys_setns
diff --git a/s390.m4 b/s390.m4
index bd74233..548dafd 100644
--- a/s390.m4
+++ b/s390.m4
@@ -253,15 +253,15 @@
 sys_epoll_wait
 sys_set_tid_address
 sys_s390_fadvise64
-sys_timer_create
-sys_timer_settime
-sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_delete
-sys_clock_settime
-sys_clock_gettime
-sys_clock_getres
-sys_clock_nanosleep
+timer_create
+timer_settime
+timer_gettime
+timer_getoverrun
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 sys_ni_syscall
 sys_s390_fadvise64_64
 sys_statfs64
@@ -336,7 +336,7 @@
 sys_prlimit64
 sys_name_to_handle_at
 open_by_handle_at
-sys_clock_adjtime
+clock_adjtime
 sys_syncfs
 sys_setns
 sys_process_vm_readv
diff --git a/s390x.m4 b/s390x.m4
index 93624bd..3c1bb17 100644
--- a/s390x.m4
+++ b/s390x.m4
@@ -253,15 +253,15 @@
 sys_epoll_wait
 sys_set_tid_address
 sys_fadvise64_64
-sys_timer_create
-sys_timer_settime
-sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_delete
-sys_clock_settime
-sys_clock_gettime
-sys_clock_getres
-sys_clock_nanosleep
+timer_create
+timer_settime
+timer_gettime
+timer_getoverrun
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 sys_ni_syscall
 sys_ni_syscall
 sys_statfs64
@@ -336,7 +336,7 @@
 sys_prlimit64
 sys_name_to_handle_at
 open_by_handle_at
-sys_clock_adjtime
+clock_adjtime
 sys_syncfs
 sys_setns
 sys_process_vm_readv
diff --git a/score.m4 b/score.m4
index 3831e2a..f8974b0 100644
--- a/score.m4
+++ b/score.m4
@@ -106,15 +106,15 @@
 sys_kexec_load
 sys_init_module
 sys_delete_module
-sys_timer_create
-sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_settime
-sys_timer_delete
-sys_clock_settime
-sys_clock_gettime
-sys_clock_getres
-sys_clock_nanosleep
+timer_create
+timer_gettime
+timer_getoverrun
+timer_settime
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 sys_syslog
 sys_ptrace
 sched_setparam
@@ -249,7 +249,7 @@
 sys_fanotify_mark
 sys_name_to_handle_at
 open_by_handle_at
-sys_clock_adjtime
+clock_adjtime
 sys_syncfs
 sys_setns
 sys_sendmmsg
diff --git a/sh32.m4 b/sh32.m4
index b61f9a6..4ab8eb7 100644
--- a/sh32.m4
+++ b/sh32.m4
@@ -258,15 +258,15 @@
 sys_epoll_wait
 sys_remap_file_pages
 sys_set_tid_address
-sys_timer_create
-sys_timer_settime
-sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_delete
-sys_clock_settime
-sys_clock_gettime
-sys_clock_getres
-sys_clock_nanosleep
+timer_create
+timer_settime
+timer_gettime
+timer_getoverrun
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 sys_statfs64
 sys_fstatfs64
 sys_tgkill
@@ -360,7 +360,7 @@
 sys_accept4
 sys_name_to_handle_at
 open_by_handle_at
-sys_clock_adjtime
+clock_adjtime
 sys_syncfs
 sys_sendmmsg
 sys_setns
diff --git a/sh64.m4 b/sh64.m4
index 5dcf7ec..73f0b31 100644
--- a/sh64.m4
+++ b/sh64.m4
@@ -286,15 +286,15 @@
 sys_epoll_wait
 sys_remap_file_pages
 sys_set_tid_address
-sys_timer_create
-sys_timer_settime
-sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_delete
-sys_clock_settime
-sys_clock_gettime
-sys_clock_getres
-sys_clock_nanosleep
+timer_create
+timer_settime
+timer_gettime
+timer_getoverrun
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 sys_statfs64
 sys_fstatfs64
 sys_tgkill
@@ -371,7 +371,7 @@
 sys_prlimit64
 sys_name_to_handle_at
 open_by_handle_at
-sys_clock_adjtime
+clock_adjtime
 sys_syncfs
 sys_sendmmsg
 sys_setns
diff --git a/sparc-C.m4 b/sparc-C.m4
index c028372..df5866e 100644
--- a/sparc-C.m4
+++ b/sparc-C.m4
@@ -255,17 +255,17 @@
 sys_fdatasync
 sys_nis_syscall
 sys32_sync_file_range
-compat_sys_clock_settime
-compat_sys_clock_gettime
-compat_sys_clock_getres
+clock_settime
+clock_gettime
+clock_getres
 sys32_clock_nanosleep
 sched_getaffinity
 sched_setaffinity
 sys32_timer_settime
-compat_sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_delete
-compat_sys_timer_create
+timer_gettime
+timer_getoverrun
+timer_delete
+timer_create
 sys_ni_syscall
 io_setup
 io_destroy
@@ -333,7 +333,7 @@
 sys_prlimit64
 sys_name_to_handle_at
 open_by_handle_at
-compat_sys_clock_adjtime
+clock_adjtime
 sys_syncfs
 compat_sys_sendmmsg
 sys_setns
diff --git a/sparc32.m4 b/sparc32.m4
index d24546e..b1110a2 100644
--- a/sparc32.m4
+++ b/sparc32.m4
@@ -255,17 +255,17 @@
 sys_fdatasync
 sys_ni_syscall
 sys_sync_file_range
-sys_clock_settime
-sys_clock_gettime
-sys_clock_getres
-sys_clock_nanosleep
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 sched_getaffinity
 sched_setaffinity
-sys_timer_settime
-sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_delete
-sys_timer_create
+timer_settime
+timer_gettime
+timer_getoverrun
+timer_delete
+timer_create
 sys_nis_syscall
 io_setup
 io_destroy
@@ -333,7 +333,7 @@
 sys_prlimit64
 sys_name_to_handle_at
 open_by_handle_at
-sys_clock_adjtime
+clock_adjtime
 sys_syncfs
 sys_sendmmsg
 sys_setns
diff --git a/sparc64.m4 b/sparc64.m4
index 2233270..24d79a6 100644
--- a/sparc64.m4
+++ b/sparc64.m4
@@ -255,17 +255,17 @@
 sys_fdatasync
 sys_nis_syscall
 sys_sync_file_range
-sys_clock_settime
-sys_clock_gettime
-sys_clock_getres
-sys_clock_nanosleep
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 sched_getaffinity
 sched_setaffinity
-sys_timer_settime
-sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_delete
-sys_timer_create
+timer_settime
+timer_gettime
+timer_getoverrun
+timer_delete
+timer_create
 sys_ni_syscall
 io_setup
 io_destroy
@@ -333,7 +333,7 @@
 sys_prlimit64
 sys_name_to_handle_at
 open_by_handle_at
-sys_clock_adjtime
+clock_adjtime
 sys_syncfs
 sys_sendmmsg
 sys_setns
diff --git a/tile-C.m4 b/tile-C.m4
index b88dc99..57131ca 100644
--- a/tile-C.m4
+++ b/tile-C.m4
@@ -106,15 +106,15 @@
 compat_sys_kexec_load
 sys_init_module
 sys_delete_module
-compat_sys_timer_create
-compat_sys_timer_gettime
-sys_timer_getoverrun
-compat_sys_timer_settime
-sys_timer_delete
-compat_sys_clock_settime
-compat_sys_clock_gettime
-compat_sys_clock_getres
-compat_sys_clock_nanosleep
+timer_create
+timer_gettime
+timer_getoverrun
+timer_settime
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 sys_syslog
 sys_ptrace
 sched_setparam
@@ -249,7 +249,7 @@
 sys_fanotify_mark
 sys_name_to_handle_at
 open_by_handle_at
-compat_sys_clock_adjtime
+clock_adjtime
 sys_syncfs
 sys_setns
 compat_sys_sendmmsg
diff --git a/tile32.m4 b/tile32.m4
index 8556254..80139df 100644
--- a/tile32.m4
+++ b/tile32.m4
@@ -106,15 +106,15 @@
 sys_kexec_load
 sys_init_module
 sys_delete_module
-sys_timer_create
-sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_settime
-sys_timer_delete
-sys_clock_settime
-sys_clock_gettime
-sys_clock_getres
-sys_clock_nanosleep
+timer_create
+timer_gettime
+timer_getoverrun
+timer_settime
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 sys_syslog
 sys_ptrace
 sched_setparam
@@ -249,7 +249,7 @@
 sys_fanotify_mark
 sys_name_to_handle_at
 open_by_handle_at
-sys_clock_adjtime
+clock_adjtime
 sys_syncfs
 sys_setns
 sys_sendmmsg
diff --git a/tile64.m4 b/tile64.m4
index f69c4d7..c5256f9 100644
--- a/tile64.m4
+++ b/tile64.m4
@@ -106,15 +106,15 @@
 sys_kexec_load
 sys_init_module
 sys_delete_module
-sys_timer_create
-sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_settime
-sys_timer_delete
-sys_clock_settime
-sys_clock_gettime
-sys_clock_getres
-sys_clock_nanosleep
+timer_create
+timer_gettime
+timer_getoverrun
+timer_settime
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 sys_syslog
 sys_ptrace
 sched_setparam
@@ -249,7 +249,7 @@
 sys_fanotify_mark
 sys_name_to_handle_at
 open_by_handle_at
-sys_clock_adjtime
+clock_adjtime
 sys_syncfs
 sys_setns
 sys_sendmmsg
diff --git a/unicore32.m4 b/unicore32.m4
index 63cc8a5..c0d1c1f 100644
--- a/unicore32.m4
+++ b/unicore32.m4
@@ -106,15 +106,15 @@
 sys_kexec_load
 sys_init_module
 sys_delete_module
-sys_timer_create
-sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_settime
-sys_timer_delete
-sys_clock_settime
-sys_clock_gettime
-sys_clock_getres
-sys_clock_nanosleep
+timer_create
+timer_gettime
+timer_getoverrun
+timer_settime
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 sys_syslog
 sys_ptrace
 sched_setparam
@@ -249,7 +249,7 @@
 sys_fanotify_mark
 sys_name_to_handle_at
 open_by_handle_at
-sys_clock_adjtime
+clock_adjtime
 sys_syncfs
 sys_setns
 sys_sendmmsg
diff --git a/x32.m4 b/x32.m4
index dcd9490..b6fbef7 100644
--- a/x32.m4
+++ b/x32.m4
@@ -195,14 +195,14 @@
 sys_restart_syscall
 sys_semtimedop
 sys_fadvise64
-sys_timer_settime
-sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_delete
-sys_clock_settime
-sys_clock_gettime
-sys_clock_getres
-sys_clock_nanosleep
+timer_settime
+timer_gettime
+timer_getoverrun
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 sys_exit_group
 sys_epoll_wait
 sys_epoll_ctl
@@ -265,7 +265,7 @@
 sys_prlimit64
 sys_name_to_handle_at
 open_by_handle_at
-sys_clock_adjtime
+BUG(sys_clock_adjtime,	really fucked - compat variant won't work either)
 sys_syncfs
 sys_setns
 sys_getcpu
@@ -284,7 +284,7 @@
 compat_sys_rt_sigtimedwait
 compat_sys_rt_sigqueueinfo
 compat_sys_sigaltstack
-compat_sys_timer_create
+timer_create
 compat_sys_mq_notify
 compat_sys_kexec_load
 compat_sys_waitid
diff --git a/x86-C.m4 b/x86-C.m4
index 1de9e93..a5203c2 100644
--- a/x86-C.m4
+++ b/x86-C.m4
@@ -238,15 +238,15 @@
 sys_epoll_wait
 sys_remap_file_pages
 sys_set_tid_address
-compat_sys_timer_create
-compat_sys_timer_settime
-compat_sys_timer_gettime
-sys_timer_getoverrun
-sys_timer_delete
-compat_sys_clock_settime
-compat_sys_clock_gettime
-compat_sys_clock_getres
-compat_sys_clock_nanosleep
+timer_create
+timer_settime
+timer_gettime
+timer_getoverrun
+timer_delete
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
 compat_sys_statfs64
 compat_sys_fstatfs64
 sys_tgkill
@@ -320,7 +320,7 @@
 sys_prlimit64
 sys_name_to_handle_at
 open_by_handle_at
-compat_sys_clock_adjtime
+clock_adjtime
 sys_syncfs
 compat_sys_sendmmsg
 sys_setns
diff --git a/xtensa.m4 b/xtensa.m4
index 82bbbad..f25eb6f 100644
--- a/xtensa.m4
+++ b/xtensa.m4
@@ -241,15 +241,15 @@
 io_submit
 io_getevents
 io_cancel
-sys_clock_settime
-sys_clock_gettime
-sys_clock_getres
-sys_clock_nanosleep
-sys_timer_create
-sys_timer_delete
-sys_timer_settime
-sys_timer_gettime
-sys_timer_getoverrun
+clock_settime
+clock_gettime
+clock_getres
+clock_nanosleep
+timer_create
+timer_delete
+timer_settime
+timer_gettime
+timer_getoverrun
 sys_ni_syscall
 sys_lookup_dcookie
 sys_ni_syscall
@@ -326,6 +326,6 @@
 sys_sync_file_range2
 sys_perf_event_open
 sys_rt_tgsigqueueinfo
-sys_clock_adjtime
+clock_adjtime
 sys_prlimit64
 sys_kcmp