diff --git a/.cvsignore b/.cvsignore
index b9be158..83c6971 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-psmisc-21.7.tar.gz
+psmisc-21.8.tar.gz
diff --git a/psmisc.spec b/psmisc.spec
index 75787de..795ca55 100644
--- a/psmisc.spec
+++ b/psmisc.spec
@@ -5,8 +5,8 @@
 
 Summary: Utilities for managing processes on your system.
 Name: psmisc
-Version: 21.7
-Release: 1.cvs20051005
+Version: 21.8
+Release: 1
 License: BSD/GPL
 Group: Applications/System
 Source: ftp://ftp.sf.net/pub/sourceforge/psmisc/psmisc-%{version}.tar.gz
@@ -18,6 +18,7 @@ BuildRequires: libselinux-devel
 %endif
 
 Patch0: psmisc-21.7-fuser-pid.patch
+Patch1: psmisc-21.7-killall-scanf.patch
 
 %description
 The psmisc package contains utilities for managing processes on your
@@ -30,6 +31,7 @@ of processes that are using specified files or filesystems.
 %prep
 %setup -q
 %patch0 -p1 -b .pid
+%patch1 -p1 -b .scanf
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
@@ -74,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Nov 30 2005 Karel Zak <kzak@redhat.com> 21.8-1
+- fix #174585 - killall crashes on long variable name
+
 * Wed Oct  5 2005 Karel Zak <kzak@redhat.com> 21.7-1.cvs20051005
 - sync with upstream CVS
 - use old version of fuser
diff --git a/sources b/sources
index c273df4..db1c02f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b77cf2279241eb580a10c8dd411cff79  psmisc-21.7.tar.gz
+d6276e071c10ddf4b0d98856e5573e1a  psmisc-21.8.tar.gz