diff --git a/.cvsignore b/.cvsignore
index ec5775c..b2c3706 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -153,3 +153,4 @@ policycoreutils-2.0.16.tgz
 policycoreutils-2.0.19.tgz
 policycoreutils-2.0.20.tgz
 policycoreutils-2.0.21.tgz
+policycoreutils-2.0.22.tgz
diff --git a/policycoreutils.spec b/policycoreutils.spec
index 2b04c87..1d88765 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -1,12 +1,12 @@
 %define libauditver 1.4.2-1
-%define libsepolver 2.0.1-1
+%define libsepolver 2.0.4-1
 %define libsemanagever 1.10.0-1
-%define libselinuxver 2.0.0-1
+%define libselinuxver 2.0.22-1
 %define sepolgenver 1.0.8
 Summary: SELinux policy core utilities.
 Name: policycoreutils
-Version: 2.0.21
-Release: 2%{?dist}
+Version: 2.0.22
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -192,6 +192,10 @@ if [ "$1" -ge "1" ]; then
 fi
 
 %changelog
+* Thu Jun 21 2007 Dan Walsh <dwalsh@redhat.com> 2.0.22-1
+- Update to match NSA
+	* Rebase setfiles to use new labeling interface.
+
 * Wed Jun 13 2007 Dan Walsh <dwalsh@redhat.com> 2.0.21-2
 - Add filter to all system-config-selinux lists
 
diff --git a/sources b/sources
index fcb54c9..6cad5fc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 4d6e57c7fc396efbcf96b7accab4ba30  sepolgen-1.0.8.tgz
-f1c979ad525d15d95aac66fb69d9eb63  policycoreutils-2.0.21.tgz
+c05076378476ef69ca12d5be80898ffe  policycoreutils-2.0.22.tgz