diff --git a/.cvsignore b/.cvsignore
index 1140c05..e47d1d2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -52,3 +52,5 @@ checkpolicy-1.30.11.tgz
 checkpolicy-1.30.12.tgz
 checkpolicy-1.32.tgz
 checkpolicy-1.33.1.tgz
+checkpolicy-1.34.0.tgz
+checkpolicy-2.0.0.tgz
diff --git a/checkpolicy.spec b/checkpolicy.spec
index 1790583..c2a411f 100644
--- a/checkpolicy.spec
+++ b/checkpolicy.spec
@@ -1,8 +1,8 @@
-%define libsepolver 1.15.2-1
+%define libsepolver 2.0.1-1
 Summary: SELinux policy compiler
 Name: checkpolicy
-Version: 1.33.1
-Release: 2%{?dist}
+Version: 2.0.0
+Release: 1%{?dist}
 License: GPL
 Group: Development/System
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -47,6 +47,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/checkmodule.8.gz
 
 %changelog
+* Tue Nov 14 2006 Dan Walsh <dwalsh@redhat.com> - 2.0.0-1
+- Latest update from NSA
+	* Merged patch to use new libsepol error codes by Karl MacMillan.
+	* Updated version for stable branch.
+
 * Tue Nov 14 2006 Dan Walsh <dwalsh@redhat.com> - 1.33.1-2
 - Rebuild for new libraries
 
diff --git a/sources b/sources
index c10e4cc..17dd9d9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6dfa0616268eb3a5a7d4a9e61a520a97  checkpolicy-1.33.1.tgz
+1415ae6b8dcaea1b599f8c68c8c27e4a  checkpolicy-2.0.0.tgz