diff --git a/psmisc-22.8-to-22.7-backport.patch b/psmisc-22.8-to-22.7-backport.patch
new file mode 100644
index 0000000..b5a4a1e
--- /dev/null
+++ b/psmisc-22.8-to-22.7-backport.patch
@@ -0,0 +1,12 @@
+--- src/pstree.c.orig	2008-12-16 11:13:35.000000000 +0100
++++ src/pstree.c	2009-10-08 19:37:59.000000000 +0200
+@@ -749,6 +749,9 @@
+ 			exit (1);
+ 		      }
+ 		    (void) close (fd);
++			/* If we have read the maximum screen length of args, bring it back by one to stop overflow */
++			if (size >= buffer_size)
++			  size--;
+ 		    if (size)
+ 		      buffer[size++] = 0;
+ #ifdef WITH_SELINUX
diff --git a/psmisc.changes b/psmisc.changes
index 96c4ac0..a38b9d2 100644
--- a/psmisc.changes
+++ b/psmisc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Oct  9 08:20:29 UTC 2009 - aj@suse.de
+
+- fix pstree -a crash (bnc#545265) with patch backported from 22.8
+  by Björn Voigt <bjoern@cs.tu-berlin.de>.
+
 -------------------------------------------------------------------
 Thu Sep 10 10:21:09 CEST 2009 - werner@suse.de
 
diff --git a/psmisc.spec b/psmisc.spec
index 2412209..d4cfa24 100644
--- a/psmisc.spec
+++ b/psmisc.spec
@@ -39,6 +39,7 @@ Patch4:         %name-22.7-writeonly.patch
 Patch5:         %name-22.6-fdleak.patch
 Patch6:         %name-22.6-tigetstr.patch
 Patch7:         %name-22.7-memleaks.patch
+Patch8:		%name-22.8-to-22.7-backport.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define nopeek  s390 s390x ia64 %arm
 
@@ -66,6 +67,7 @@ Authors:
 %patch6 -p0 -b .tigetstr
 %patch7 -p0 -b .memleaks
 %patch0 -p0
+%patch8 -p0
 
 %build
 autoreconf -fi