diff --git a/.cvsignore b/.cvsignore
index 475cf1b..2b3f2bb 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -71,3 +71,5 @@ checkpolicy-2.0.16.tgz
 checkpolicy-2.0.17.tgz
 checkpolicy-2.0.18.tgz
 checkpolicy-2.0.19.tgz
+checkpolicy-2.0.20.tgz
+checkpolicy-2.0.21.tgz
diff --git a/checkpolicy.spec b/checkpolicy.spec
index dc7305a..622f2ff 100644
--- a/checkpolicy.spec
+++ b/checkpolicy.spec
@@ -1,8 +1,8 @@
-%define libsepolver 2.0.35-1
+%define libsepolver 2.0.39-1
 Summary: SELinux policy compiler
 Name: checkpolicy
-Version: 2.0.19
-Release: 3%{?dist}
+Version: 2.0.21
+Release: 1%{?dist}
 License: GPLv2
 Group: Development/System
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -55,6 +55,12 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_bindir}/sedispol
 
 %changelog
+* Tue Nov 1 2009 Dan Walsh <dwalsh@redhat.com> - 2.0.21-1
+- Latest update from NSA
+	* Add support for building Xen policies from Paul Nuzzi.
+	* Add long options to checkpolicy and checkmodule by Guido
+	  Trentalancia <guido@trentalancia.com>
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.19-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index fe56b5a..397517f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7f6b0a4cb49e62f0eb1fef28e1da117e  checkpolicy-2.0.19.tgz
+c95a8fd53be09715f6652cc93fcd646d  checkpolicy-2.0.21.tgz