diff --git a/.cvsignore b/.cvsignore
index 3142603..661ca3d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-LVM2.2.02.20.tgz
+LVM2.2.02.21.tgz
diff --git a/lvm2.spec b/lvm2.spec
index f8df135..8be0a59 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -1,8 +1,8 @@
-%define device_mapper_version 1.02.16-1
+%define device_mapper_version 1.02.17-1
 
 Summary: Userland logical volume management tools 
 Name: lvm2
-Version: 2.02.20
+Version: 2.02.21
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -112,6 +112,12 @@ fi
 
 
 %changelog
+* Tue Jan 30 2007 Alasdair Kergon <agk@redhat.com> - 2.02.21-1
+- Fix vgsplit to handle mirrors.
+- Reorder fields in reporting field definitions.
+- Fix vgs to treat args as VGs even when PV fields are displayed.
+- Fix md signature check to handle both endiannesses.
+
 * Fri Jan 26 2007 Alasdair Kergon <agk@redhat.com> - 2.02.20-1
 - Fix exit statuses of reporting tools.
 - Add some missing close() and fclose() return code checks.
diff --git a/sources b/sources
index 7c0cb4d..b06cb5e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-edaef626b1a6487bbc9b2acabf036cda  LVM2.2.02.20.tgz
+3bd758564012805f1243fc39b8dace31  LVM2.2.02.21.tgz
diff --git a/upstream b/upstream
index 3142603..661ca3d 100644
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-LVM2.2.02.20.tgz
+LVM2.2.02.21.tgz