diff --git a/.cvsignore b/.cvsignore
index 7b0cba7..ea89ce6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-psmisc-21.4.tar.gz
+psmisc-21.5.tar.gz
diff --git a/psmisc.spec b/psmisc.spec
index 994122d..70e9bff 100644
--- a/psmisc.spec
+++ b/psmisc.spec
@@ -5,13 +5,14 @@
 
 Summary: Utilities for managing processes on your system.
 Name: psmisc
-Version: 21.4
-Release: 4
+Version: 21.5
+Release: 1
 License: BSD/GPL
 Group: Applications/System
 Source: ftp://ftp.sf.net/pub/sourceforge/psmisc/psmisc-%{version}.tar.gz
 Patch0: psmisc-20.2-56186.patch
-Patch2: psmisc-21.4-redhat-selinux-psmisc.patch
+Patch1: psmisc-21.5-selinux.patch
+Patch2: psmisc-21.5-term.patch
 URL: http://psmisc.sourceforge.net
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libtermcap-devel
@@ -31,7 +32,8 @@ of processes that are using specified files or filesystems.
 %setup -q
 %patch0 -p1 -b .56186
 %if %{WITH_SELINUX}
-%patch2 -p1 -b .redhat-selinux-psmisc
+%patch1 -p1 -b .selinux
+%patch2 -p1 -b .term
 %endif
 
 %build
@@ -76,6 +78,11 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Dec 13 2004 Karel Zak <kzak@redhat.com> 21.5-1
+- Updated to new upstream version 21.5
+- Ported SELinux patch forward as psmisc-21.5-selinux.patch
+- Added psmisc-21.5-term.patch that fix termcap.h and term.h conflicts
+
 * Fri Sep 24 2004 Mike A. Harris <mharris@redhat.com> 21.4-4
 - Added "BuildRequires: libselinux-devel" for WITH_SELINUX builds (#123754)
 
diff --git a/sources b/sources
index 7432018..98167ae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8449269fdc8ae5d7d494df745e1180d3  psmisc-21.4.tar.gz
+c62b09ad5129e2f7e4611019d1d3d4b8  psmisc-21.5.tar.gz