diff --git a/.cvsignore b/.cvsignore
index d5984c7..06f0939 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-psmisc-20.2.tar.bz2
+psmisc-21.2.tar.gz
diff --git a/psmisc.spec b/psmisc.spec
index 429d37e..a2d3a6d 100644
--- a/psmisc.spec
+++ b/psmisc.spec
@@ -1,13 +1,16 @@
+%define with_pidof 0
+
 Summary: Utilities for managing processes on your system.
 Name: psmisc
-Version: 20.2
-Release: 6
+Version: 21.2
+Release: 4
 License: BSD/GPL
 Group: Applications/System
-Source: ftp://prdownloads.sourceforge.net/psmisc/psmisc-%{version}.tar.bz2
+Source: ftp://ftp.sf.net/pub/sourceforge/psmisc/psmisc-%{version}.tar.gz
+# psmisc 21.2 has a fix for this already, remove once confirmed
 Source1: gensig.sh
 Patch0: psmisc-20.2-56186.patch
-URL: http://psmisc.sourceforge.net/
+URL: http://psmisc.sourceforge.net
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libtermcap-devel
 
@@ -22,38 +25,67 @@ of processes that are using specified files or filesystems.
 %prep
 %setup -q
 %patch0 -p1 -b .56186
-sh %{SOURCE1} >src/signames.h
+# psmisc 21.2 has a fix for this already
+#sh %{SOURCE1} >src/signames.h
 
 %build
 
 perl -pi -e "s,^CFLAGS =,CFLAGS = $RPM_OPT_FLAGS -D_GNU_SOURCE,g" */Makefile.*
+
+# Is --prefix actually necessary here?  I think it's redundant... test later...
 %configure --prefix=/usr
 make 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 make install DESTDIR="$RPM_BUILD_ROOT"
 mkdir -p $RPM_BUILD_ROOT/sbin
-mv $RPM_BUILD_ROOT/usr/bin/fuser $RPM_BUILD_ROOT/sbin
+mv $RPM_BUILD_ROOT%{_bindir}/fuser $RPM_BUILD_ROOT/sbin
+%if ! %{with_pidof}
+rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/pidof.1*
+%endif
+
 %find_lang %name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f %name.lang
+%files -f %{name}.lang
 %defattr(-,root,root)
 /sbin/fuser
-/usr/bin/killall
-/usr/bin/pstree
+%{_bindir}/killall
+%{_bindir}/pstree
 %{_mandir}/man1/fuser.1*
 %{_mandir}/man1/killall.1*
 %{_mandir}/man1/pstree.1*
+%if %{with_pidof}
+%{_mandir}/man1/pidof.1*
+%endif
 
 %changelog
-* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
+* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
+- rebuilt
+
+* Wed Nov 13 2002 Mike A. Harris <mharris@redhat.com> 21.2-3
+- Remove pidof manpage from buildroot by adding with_pidof conditional
+- _bindir cleanup
+
+* Wed Nov 13 2002 Mike A. Harris <mharris@redhat.com> 21.2-2
+- Updated to new upstream version 21.2
+- Updated Source: URL to sourceforge's current ftp area
+- Fixes fuser largefile bug (#66340)
+- Disable prep time sh %%{SOURCE1} >src/signames.h as the 21.2 release
+  fixes this already now.
+
+* Tue Oct  8 2002 Mike A. Harris <mharris@redhat.com> 20.2-7
+- All-arch rebuild
+- Updated spec file with _bindir et al. fixes.
+
+* Fri Jun 21 2002 Tim Powers <timp@redhat.com> 20.2-6
 - automated rebuild
 
-* Sun May 26 2002 Tim Powers <timp@redhat.com>
+* Sun May 26 2002 Tim Powers <timp@redhat.com> 20.2-5
 - automated rebuild
 
 * Thu May 16 2002 Bernhard Rosenkraenzer <bero@redhat.com> 20.2-4
diff --git a/sources b/sources
index c5fbe83..7f3771b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-27327300d6301d61866a44e4d38c01e2  psmisc-20.2.tar.bz2
+0749017f500b171f053d7c1fd72df537  psmisc-21.2.tar.gz