diff --git a/ptrace.diff b/ptrace.diff
new file mode 100644
index 0000000..48b5672
--- /dev/null
+++ b/ptrace.diff
@@ -0,0 +1,47 @@
+--- process.c
++++ process.c
+@@ -2242,6 +2242,18 @@
+ #ifdef PTRACE_SETVRREGS
+ 	{ PTRACE_SETVRREGS,	"PTRACE_SETVRREGS",	},
+ #endif
++#ifdef PTRACE_SETOPTIONS
++	{ PTRACE_SETOPTIONS,	"PTRACE_SETOPTIONS",	},
++#endif
++#ifdef PTRACE_GETEVENTMSG
++	{ PTRACE_GETEVENTMSG,	"PTRACE_GETEVENTMSG",	},
++#endif
++#ifdef PTRACE_GETSIGINFO
++	{ PTRACE_GETSIGINFO,	"PTRACE_GETSIGINFO",	},
++#endif
++#ifdef PTRACE_SETSIGINFO
++	{ PTRACE_SETSIGINFO,	"PTRACE_SETSIGINFO",	},
++#endif
+ #ifdef SUNOS4
+ 	{ PTRACE_READDATA,	"PTRACE_READDATA"	},
+ 	{ PTRACE_WRITEDATA,	"PTRACE_WRITEDATA"	},
+@@ -3016,10 +3028,12 @@
+ 			tprintf("%#lx, ", tcp->u_arg[2]);
+ #ifdef LINUX
+ 		switch (tcp->u_arg[0]) {
++#ifndef IA64
+ 		case PTRACE_PEEKDATA:
+ 		case PTRACE_PEEKTEXT:
+ 		case PTRACE_PEEKUSER:
+ 			break;
++#endif
+ 		case PTRACE_CONT:
+ 		case PTRACE_SINGLESTEP:
+ 		case PTRACE_SYSCALL:
+@@ -3035,8 +3049,12 @@
+ 		case PTRACE_PEEKDATA:
+ 		case PTRACE_PEEKTEXT:
+ 		case PTRACE_PEEKUSER:
++#ifdef IA64
++			return RVAL_HEX;
++#else
+ 			printnum(tcp, tcp->u_arg[3], "%#lx");
+ 			break;
++#endif
+ 		}
+ 	}
+ #endif /* LINUX */
diff --git a/strace.changes b/strace.changes
index b60664a..8501d0b 100644
--- a/strace.changes
+++ b/strace.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Apr 18 21:22:32 CEST 2007 - schwab@suse.de
+
+- Decode more ptrace options.
+
 -------------------------------------------------------------------
 Fri Mar 16 11:33:22 CET 2007 - schwab@suse.de
 
diff --git a/strace.spec b/strace.spec
index 99f8c85..5278d52 100644
--- a/strace.spec
+++ b/strace.spec
@@ -16,7 +16,7 @@ License:        Other License(s), see package
 Group:          Development/Tools/Debuggers
 Autoreqprov:    on
 Version:        4.5.15
-Release:        6
+Release:        10
 Summary:        A utility to trace the system calls of a program
 Source:         strace-%{version}.tar.bz2
 Patch:          strace-%{version}.diff
@@ -26,7 +26,8 @@ Patch4:         strace-sysinfo.diff
 Patch5:         strace-graph.diff
 Patch6:         ioctl.diff
 Patch7:         fstatat-ppc64.patch
-URL:            http://www.liacs.nl/~wichert/strace/
+Patch8:         ptrace.diff
+URL:            http://sourceforge.net/projects/strace/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -51,6 +52,7 @@ Authors:
 %patch5
 %patch6
 %patch7
+%patch8
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -74,6 +76,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_mandir}/man1/strace.1.gz
 
 %changelog
+* Wed Apr 18 2007 - schwab@suse.de
+- Decode more ptrace options.
 * Fri Mar 16 2007 - schwab@suse.de
 - Remove obsolete patch.
 * Wed Jan 17 2007 - schwab@suse.de