diff --git a/strace/.md5sum b/strace/.md5sum
index 5783c071..1dfc2ba7 100644
--- a/strace/.md5sum
+++ b/strace/.md5sum
@@ -1 +1,3 @@
+7b5ac20ca63a27e6a463d8ee151b046a  strace-4.5.14-glibc25.diff
+551876928976e6f71c16a9aa43f3e5fd  strace-4.5.14-kernel-headers.2.6.18.diff
 09bcd5d00ece28f8154dec11cadfce3c  strace-4.5.14.tar.bz2
diff --git a/strace/Pkgfile b/strace/Pkgfile
index 95331122..bb52b3c1 100644
--- a/strace/Pkgfile
+++ b/strace/Pkgfile
@@ -1,14 +1,18 @@
 # Description: System call tracing utility (like trace, truss, etc)
 # URL:         http://www.liacs.nl/~wichert/strace/
-# Maintainer:  Per Lidén, core-ports at crux dot nu
+# Maintainer:  Johannes Winkelmann, jw at smts dot ch
 
 name=strace
 version=4.5.14
 release=1
-source=(http://dl.sourceforge.net/$name/$name-$version.tar.bz2)
+source=(http://dl.sourceforge.net/$name/$name-$version.tar.bz2
+        strace-4.5.14-kernel-headers.2.6.18.diff
+	strace-4.5.14-glibc25.diff)
 
 build() {
     cd $name-$version
+    patch -p0 -i $SRC/strace-4.5.14-glibc25.diff
+    patch -p0 -i $SRC/strace-4.5.14-kernel-headers.2.6.18.diff
     ./configure --prefix=/usr
     make
     make DESTDIR=$PKG install
diff --git a/strace/strace-4.5.14-glibc25.diff b/strace/strace-4.5.14-glibc25.diff
new file mode 100644
index 00000000..95ef40df
--- /dev/null
+++ b/strace/strace-4.5.14-glibc25.diff
@@ -0,0 +1,11 @@
+--- strace.c.orig	2006-10-01 14:48:30.000000000 +0200
++++ strace.c	2006-10-01 14:48:08.000000000 +0200
+@@ -2251,7 +2251,7 @@
+ 			if (!cflag
+ 			    && (qual_flags[WSTOPSIG(status)] & QUAL_SIGNAL)) {
+ 				unsigned long addr = 0, pc = 0;
+-#ifdef PT_GETSIGINFO
++#if defined(PT_GETSIGINFO) && defined(IA64)
+ #				define PSR_RI	41
+ 				struct siginfo si;
+ 				unsigned long psr;
diff --git a/strace/strace-4.5.14-kernel-headers.2.6.18.diff b/strace/strace-4.5.14-kernel-headers.2.6.18.diff
new file mode 100644
index 00000000..d4428268
--- /dev/null
+++ b/strace/strace-4.5.14-kernel-headers.2.6.18.diff
@@ -0,0 +1,10 @@
+--- system.c.orig	2006-10-02 01:01:55.000000000 +0200
++++ system.c	2006-10-02 01:02:19.000000000 +0200
+@@ -78,6 +78,7 @@
+ #endif
+ 
+ #include <linux/sysctl.h>
++#define CTL_PROC 4 /* not that we should use those anyway */
+ 
+ static const struct xlat mount_flags[] = {
+ 	{ MS_MGC_VAL,	"MS_MGC_VAL"	},