diff --git a/.cvsignore b/.cvsignore
index 2f2b429..8c94d82 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -45,3 +45,4 @@ checkpolicy-1.30.tgz
 checkpolicy-1.30.1.tgz
 checkpolicy-1.30.3.tgz
 checkpolicy-1.30.4.tgz
+checkpolicy-1.30.5.tgz
diff --git a/checkpolicy.spec b/checkpolicy.spec
index 00afb03..3881c78 100644
--- a/checkpolicy.spec
+++ b/checkpolicy.spec
@@ -1,7 +1,7 @@
 %define libsepolver 1.12.5-1
 Summary: SELinux policy compiler
 Name: checkpolicy
-Version: 1.30.4
+Version: 1.30.5
 Release: 1
 License: GPL
 Group: Development/System
@@ -47,6 +47,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/checkmodule.8.gz
 
 %changelog
+* Wed May 23 2006 Dan Walsh <dwalsh@redhat.com> - 1.30.5-1
+- Latest upgrade from NSA
+	* Merged compiler cleanup patch from Karl MacMillan.
+	* Merged fix warnings patch from Karl MacMillan.	
+
 * Wed Apr 5 2006 Dan Walsh <dwalsh@redhat.com> - 1.30.4-1
 - Latest upgrade from NSA
 	* Changed require_class to reject permissions that have not been
diff --git a/sources b/sources
index 250ae75..5d48a89 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4a223fa5970267bee96f98f35d2f4deb  checkpolicy-1.30.4.tgz
+ec7b2a62668d960e6160239152f20879  checkpolicy-1.30.5.tgz