diff -Naur sysdeps/unix/make-syscalls.sh sysdeps/unix/make-syscalls.sh
--- sysdeps/unix/make-syscalls.sh	2009-10-30 18:17:08.000000000 +0100
+++ sysdeps/unix/make-syscalls.sh	2009-12-22 16:43:52.000000000 +0100
@@ -195,11 +195,11 @@
 	  vcount=`expr $vcount + 1`
 	  echo "	 echo 'strong_alias ($strong, $source)'; \\"
 	fi
-	echo "	 echo 'default_symbol_version($source, $base, $ver)'; \\"
+	echo "	 echo '#include <shlib-compat.h>'; \\"
+	echo "	 echo 'versioned_symbol (libc, $source, $base, $ver)'; \\"
 	;;
       *@*)
-	base=`echo $name | sed 's/@.*//'`
-	ver=`echo $name | sed 's/.*@//'`
+	IFS="@," read base ver obs <<< "$name"
 	if test -z "$vcount" ; then
 	  source=$strong
 	  vcount=1
@@ -208,7 +208,10 @@
 	  vcount=`expr $vcount + 1`
 	  echo "	 echo 'strong_alias ($strong, $source)'; \\"
 	fi
-	echo "	 echo 'symbol_version ($source, $base, $ver)'; \\"
+	echo "	 echo '#include <shlib-compat.h>'; \\"
+	echo "	 echo '#if SHLIB_COMPAT (libc, $ver, $obs)'; \\"
+	echo "	 echo 'compat_symbol (libc, $source, $base, $ver)'; \\"
+	echo "	 echo '#endif'; \\"
 	;;
       !*)
 	name=`echo $name | sed 's/.//'`
diff -Naur sysdeps/unix/sysv/linux/i386/posix_fadvise64.S sysdeps/unix/sysv/linux/i386/posix_fadvise64.S
--- sysdeps/unix/sysv/linux/i386/posix_fadvise64.S	2009-10-30 18:17:08.000000000 +0100
+++ sysdeps/unix/sysv/linux/i386/posix_fadvise64.S	2009-12-22 16:10:29.000000000 +0100
@@ -23,6 +23,8 @@
 
 #include <kernel-features.h>
 
+#include <shlib-compat.h>
+
 #define EINVAL	22
 #define ENOSYS	38
 #define EOVERFLOW 75
@@ -158,5 +160,7 @@
 END (BP_SYM (__posix_fadvise64_l32))
 #endif
 
-default_symbol_version (__posix_fadvise64_l64, posix_fadvise64, GLIBC_2.3.3)
-symbol_version (__posix_fadvise64_l32, posix_fadvise64, GLIBC_2.2)
+versioned_symbol (libc, __posix_fadvise64_l64, posix_fadvise64, GLIBC_2_3_3)
+#if SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_3_3)
+compat_symbol (libc, __posix_fadvise64_l32, posix_fadvise64, GLIBC_2_2)
+#endif
diff -Naur sysdeps/unix/sysv/linux/i386/syscalls.list sysdeps/unix/sysv/linux/i386/syscalls.list
--- sysdeps/unix/sysv/linux/i386/syscalls.list	2009-10-30 18:17:08.000000000 +0100
+++ sysdeps/unix/sysv/linux/i386/syscalls.list	2009-12-22 16:11:44.000000000 +0100
@@ -1,8 +1,8 @@
 # File name	Caller	Syscall name	Args	Strong name	Weak names
 
 modify_ldt	EXTRA	modify_ldt	i:ipi	__modify_ldt	modify_ldt
-vm86old		EXTRA	vm86old		i:p	__vm86old	vm86@GLIBC_2.0
-vm86		-	vm86		i:ip	__vm86		vm86@@GLIBC_2.3.4
-oldgetrlimit	EXTRA	getrlimit	i:ip	__old_getrlimit	getrlimit@GLIBC_2.0
-oldsetrlimit	EXTRA	setrlimit	i:ip	__old_setrlimit	setrlimit@GLIBC_2.0
+vm86old		EXTRA	vm86old		i:p	__vm86old	vm86@GLIBC_2_0,GLIBC_2_3_4
+vm86		-	vm86		i:ip	__vm86		vm86@@GLIBC_2_3_4
+oldgetrlimit	EXTRA	getrlimit	i:ip	__old_getrlimit	getrlimit@GLIBC_2_0,GLIBC_2_2
+oldsetrlimit	EXTRA	setrlimit	i:ip	__old_setrlimit	setrlimit@GLIBC_2_0,GLIBC_2_2
 waitpid		-	waitpid		Ci:ipi	__waitpid	waitpid	__libc_waitpid
diff -Naur sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list
--- sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list	2009-10-30 18:17:08.000000000 +0100
+++ sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list	2009-12-22 16:12:07.000000000 +0100
@@ -1,5 +1,5 @@
 # File name	Caller	Syscall name	# args	Strong name	Weak names
 
 # System calls with wrappers.
-oldgetrlimit	EXTRA	getrlimit	i:ip	__old_getrlimit	getrlimit@GLIBC_2.0
-oldsetrlimit	EXTRA	setrlimit	i:ip	__old_setrlimit	setrlimit@GLIBC_2.0
+oldgetrlimit	EXTRA	getrlimit	i:ip	__old_getrlimit	getrlimit@GLIBC_2_0,GLIBC_2_2
+oldsetrlimit	EXTRA	setrlimit	i:ip	__old_setrlimit	setrlimit@GLIBC_2_0,GLIBC_2_2
diff -Naur sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list
--- sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list	2009-10-30 18:17:08.000000000 +0100
+++ sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list	2009-12-22 16:12:29.000000000 +0100
@@ -1,5 +1,5 @@
 # File name	Caller	Syscall name	Args	Strong name	Weak names
 
-oldgetrlimit	EXTRA	getrlimit	i:ip	__old_getrlimit	getrlimit@GLIBC_2.0
-oldsetrlimit	EXTRA	setrlimit	i:ip	__old_setrlimit	setrlimit@GLIBC_2.0
+oldgetrlimit	EXTRA	getrlimit	i:ip	__old_getrlimit	getrlimit@GLIBC_2_0,GLIBC_2_2
+oldsetrlimit	EXTRA	setrlimit	i:ip	__old_setrlimit	setrlimit@GLIBC_2_0,GLIBC_2_2
 vfork		-	vfork		0	__vfork		vfork