diff --git a/.cvsignore b/.cvsignore
index a556bdf..37b407a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-LVM2.2.00.20.tgz
+LVM2.2.00.21.tgz
diff --git a/lvm2.spec b/lvm2.spec
index 8489d8c..9bae4f8 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -1,13 +1,11 @@
 Summary: Userland logical volume management tools 
 Name: lvm2
-Version: 2.00.20
-Release: 2
+Version: 2.00.21
+Release: 1
 License: GPL
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
 Source0: LVM2.%{version}.tgz
-Patch0: lvm2-2.00.20-filter-dtype.patch
-Patch1: lvm2-2.00.20-viodasd.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: device-mapper
 BuildRequires: readline-devel
@@ -26,8 +24,6 @@ or more physical volumes and creating one or more logical volumes
 
 %prep
 %setup -q -n LVM2.%{version}
-%patch0 -p1 -b .dtype
-%patch1 -p1 -b .viodasd
 
 %build
 %configure --enable-static_link --enable-readline --enable-lvm1_fallback --with-staticdir=/sbin --with-user= --with-group=
@@ -60,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) /etc/lvm/lvm.conf
 
 %changelog
+* Thu Aug 19 2004 Alasdair Kergon <agk@redhat.com> - 2.00.21-1
+- New upstream release incorporating fixes plus minor enhancements.
+
 * Tue Aug 17 2004 Jeremy Katz <katzj@redhat.com> - 2.00.20-2
 - add patch for iSeries viodasd support
 - add patch to check file type using stat(2) if d_type == DT_UNKNOWN (#129674)
diff --git a/sources b/sources
index 75d651f..7c43e8a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-accbd3d84c1f8e138c4268d608ffbff8  LVM2.2.00.20.tgz
+76b6d195ba892b91445ae4598c50bcc3  LVM2.2.00.21.tgz