diff --git a/strace-4.5.15.diff b/strace-4.5.15.diff
index ec6222c..732a613 100644
--- a/strace-4.5.15.diff
+++ b/strace-4.5.15.diff
@@ -1,56 +1,3 @@
---- mem.c
-+++ mem.c
-@@ -555,7 +555,7 @@
- #if defined(LINUX) && defined(__i386__)
- void
- print_ldt_entry (ldt_entry)
--struct modify_ldt_ldt_s *ldt_entry;
-+struct user_desc *ldt_entry;
- {
- 	tprintf("base_addr:%#08lx, "
- 		"limit:%d, "
-@@ -580,10 +580,10 @@
- struct tcb *tcp;
- {
- 	if (entering(tcp)) {
--		struct modify_ldt_ldt_s copy;
-+		struct user_desc copy;
- 		tprintf("%ld", tcp->u_arg[0]);
- 		if (tcp->u_arg[1] == 0
--				|| tcp->u_arg[2] != sizeof (struct modify_ldt_ldt_s)
-+				|| tcp->u_arg[2] != sizeof (struct user_desc)
- 				|| umove(tcp, tcp->u_arg[1], &copy) == -1)
- 			tprintf(", %lx", tcp->u_arg[1]);
- 		else {
-@@ -603,7 +603,7 @@
- sys_set_thread_area(tcp)
- struct tcb *tcp;
- {
--	struct modify_ldt_ldt_s copy;
-+	struct user_desc copy;
- 	if (entering(tcp)) {
- 		if (umove(tcp, tcp->u_arg[0], &copy) != -1) {
- 			if (copy.entry_number == -1)
-@@ -632,7 +632,7 @@
- sys_get_thread_area(tcp)
- struct tcb *tcp;
- {
--	struct modify_ldt_ldt_s copy;
-+	struct user_desc copy;
- 	if (exiting(tcp)) {
- 		if (umove(tcp, tcp->u_arg[0], &copy) != -1) {
- 			tprintf("{entry_number:%d, ", copy.entry_number);
---- process.c
-+++ process.c
-@@ -591,7 +591,7 @@
- 			tprintf(", parent_tidptr=%#lx", tcp->u_arg[ARG_PTID]);
- 		if (flags & CLONE_SETTLS) {
- # ifdef I386
--			struct modify_ldt_ldt_s copy;
-+			struct user_desc copy;
- 			if (umove(tcp, tcp->u_arg[ARG_TLS], &copy) != -1) {
- 				tprintf(", {entry_number:%d, ",
- 					copy.entry_number);
 --- signal.c
 +++ signal.c
 @@ -1697,7 +1697,7 @@
@@ -82,13 +29,3 @@
  	}
  	else {
  		/* Mark that we are taking the process down.  */
---- system.c
-+++ system.c
-@@ -1612,7 +1612,6 @@
- 	{ CTL_KERN, "CTL_KERN" },
- 	{ CTL_VM, "CTL_VM" },
- 	{ CTL_NET, "CTL_NET" },
--	{ CTL_PROC, "CTL_PROC" },
- 	{ CTL_FS, "CTL_FS" },
- 	{ CTL_DEBUG, "CTL_DEBUG" },
- 	{ CTL_DEV, "CTL_DEV" },
diff --git a/strace-s390minusi.patch b/strace-s390minusi.patch
deleted file mode 100644
index 3a3b79b..0000000
--- a/strace-s390minusi.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- util.c
-+++ util.c
-@@ -1137,6 +1137,22 @@
- 		return;
- 	}
- 	tprintf("[%08lx] ", pc);
-+#elif defined(S390X)
-+	long pc;
-+	
-+	if (upeek(tcp->pid, PT_PSWADDR, &pc) < 0) {
-+		tprintf("[????????????????] ");
-+		return;
-+	}
-+	tprintf("[%016lx] ", pc);
-+#elif defined(S390)
-+	long pc;
-+	
-+	if (upeek(tcp->pid, PT_PSWADDR, &pc) < 0) {
-+		tprintf("[????????] ");
-+		return;
-+	}
-+	tprintf("[%08lx] ", pc);
- #endif /* !architecture */
- #endif /* LINUX */
- 
diff --git a/strace.changes b/strace.changes
index 7aaf318..b60664a 100644
--- a/strace.changes
+++ b/strace.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Mar 16 11:33:22 CET 2007 - schwab@suse.de
+
+- Remove obsolete patch.
+
 -------------------------------------------------------------------
 Wed Jan 17 17:47:15 CET 2007 - schwab@suse.de
 
diff --git a/strace.spec b/strace.spec
index e98ba1b..99f8c85 100644
--- a/strace.spec
+++ b/strace.spec
@@ -16,12 +16,11 @@ License:        Other License(s), see package
 Group:          Development/Tools/Debuggers
 Autoreqprov:    on
 Version:        4.5.15
-Release:        1
+Release:        6
 Summary:        A utility to trace the system calls of a program
 Source:         strace-%{version}.tar.bz2
 Patch:          strace-%{version}.diff
 Patch1:         warn.patch
-Patch2:         strace-s390minusi.patch
 Patch3:         syscalls.diff
 Patch4:         strace-sysinfo.diff
 Patch5:         strace-graph.diff
@@ -47,7 +46,6 @@ Authors:
 %setup -q
 %patch
 %patch1
-%patch2
 %patch3
 %patch4
 %patch5
@@ -75,7 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_prefix}/bin/strace-graph
 %doc %{_mandir}/man1/strace.1.gz
 
-%changelog -n strace
+%changelog
+* Fri Mar 16 2007 - schwab@suse.de
+- Remove obsolete patch.
 * Wed Jan 17 2007 - schwab@suse.de
 - Update to strace 4.5.15.
   * Bug fixes.