diff --git a/.cvsignore b/.cvsignore
index 8c94d82..c3cabe4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -46,3 +46,4 @@ checkpolicy-1.30.1.tgz
 checkpolicy-1.30.3.tgz
 checkpolicy-1.30.4.tgz
 checkpolicy-1.30.5.tgz
+checkpolicy-1.30.9.tgz
diff --git a/checkpolicy.spec b/checkpolicy.spec
index 3881c78..60b5c82 100644
--- a/checkpolicy.spec
+++ b/checkpolicy.spec
@@ -1,7 +1,7 @@
-%define libsepolver 1.12.5-1
+%define libsepolver 1.12.9-1
 Summary: SELinux policy compiler
 Name: checkpolicy
-Version: 1.30.5
+Version: 1.30.9
 Release: 1
 License: GPL
 Group: Development/System
@@ -47,6 +47,17 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/checkmodule.8.gz
 
 %changelog
+* Tue Jul 4 2006 Dan Walsh <dwalsh@redhat.com> - 1.30.8-1
+- Latest upgrade from NSA
+	* Lindent.
+	* Merged patch to remove TE rule conflict checking from the parser
+	  from Joshua Brindle.  This can only be done properly by the 
+	  expander.
+	* Merged patch to make checkpolicy/checkmodule handling of
+	  duplicate/conflicting TE rules the same as the expander 
+	  from Joshua Brindle.
+	* Merged optionals in base take 2 patch set from Joshua Brindle.
+
 * Wed May 23 2006 Dan Walsh <dwalsh@redhat.com> - 1.30.5-1
 - Latest upgrade from NSA
 	* Merged compiler cleanup patch from Karl MacMillan.
diff --git a/sources b/sources
index 5d48a89..e20bc3c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ec7b2a62668d960e6160239152f20879  checkpolicy-1.30.5.tgz
+84c291d85009265c7d6839fd00d141e7  checkpolicy-1.30.9.tgz