diff -urpd ltrace-0.5-orig/testsuite/ltrace.main/system_calls.exp ltrace-0.5/testsuite/ltrace.main/system_calls.exp
--- ltrace-0.5-orig/testsuite/ltrace.main/system_calls.exp	2006-07-14 16:51:31.000000000 -0400
+++ ltrace-0.5/testsuite/ltrace.main/system_calls.exp	2006-07-14 17:12:58.000000000 -0400
@@ -40,9 +40,9 @@ set pattern "SYS_brk"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern 1
 set pattern "SYS_open"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern 1
-set pattern "SYS_fstat"
+set pattern "SYS_(new)?fstat"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern 1
-set pattern "SYS_mmap"
+set pattern "SYS_(old_)?mmap"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern 1
 set pattern "SYS_close"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern 1
@@ -55,7 +55,7 @@ set pattern "SYS_symlink"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern 1
 set pattern "SYS_unlink"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern 1
-set pattern "SYS_stat"
+set pattern "SYS_(new)?stat"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern 1
 set pattern "SYS_access"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern 1
diff -urpd ltrace-0.5-orig/testsuite/ltrace.minor/trace-clone.exp ltrace-0.5/testsuite/ltrace.minor/trace-clone.exp
--- ltrace-0.5-orig/testsuite/ltrace.minor/trace-clone.exp	2006-07-14 16:51:31.000000000 -0400
+++ ltrace-0.5/testsuite/ltrace.minor/trace-clone.exp	2006-07-14 16:55:52.000000000 -0400
@@ -30,7 +30,7 @@ if [regexp {ELF from incompatible archit
 	fail "32-bit ltrace can not perform on 64-bit PUTs and rebuild ltrace in 64 bit mode!"
 	return
 } elseif [ regexp {Operation not permitted} $exec_output ] {
-        fail "Operation not permitted, see testrun.log for details!"
+        xfail "Operation not permitted, see testrun.log for details!"
         return
 } elseif [ regexp {killed by SIGKILL} $exec_output ] {
         fail "killed by SIGKILL!"
diff -up ltrace-0.5/testsuite/ltrace.minor/trace-clone.c\~ ltrace-0.5/testsuite/ltrace.minor/trace-clone.c
--- ltrace-0.5/testsuite/ltrace.minor/trace-clone.c~	2006-03-16 01:38:47.000000000 +0100
+++ ltrace-0.5/testsuite/ltrace.minor/trace-clone.c	2011-09-22 14:19:24.895860895 +0200
@@ -4,6 +4,7 @@
 
    This file was written by Yao Qi <qiyao@cn.ibm.com>.  */
 
+#define _GNU_SOURCE
 #include <stdio.h>
 #include <sys/types.h>
 #include <stdlib.h>

diff -urp ltrace-0.5/testsuite/ltrace.minor/demangle-lib.cpp ltrace-0.5-m/testsuite/ltrace.minor/demangle-lib.cpp
--- ltrace-0.5/testsuite/ltrace.minor/demangle-lib.cpp	2006-03-14 00:12:01.000000000 +0100
+++ ltrace-0.5-m/testsuite/ltrace.minor/demangle-lib.cpp	2008-09-01 13:11:10.000000000 +0200
@@ -1,5 +1,6 @@
 #include<stddef.h>
 #include<iostream>
+#include<stdlib.h>
 
 #include"demangle.h"