diff --git a/.cvsignore b/.cvsignore
index 63733be..b0591d4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -17,3 +17,4 @@ checkpolicy-1.23.4.tgz
 checkpolicy-1.25.2.tgz
 checkpolicy-1.25.3.tgz
 checkpolicy-1.25.5.tgz
+checkpolicy-1.25.8.tgz
diff --git a/checkpolicy.spec b/checkpolicy.spec
index 3969b95..9f2a90e 100644
--- a/checkpolicy.spec
+++ b/checkpolicy.spec
@@ -1,7 +1,7 @@
-%define libsepolver 1.7.6-2
+%define libsepolver 1.7.13-1
 Summary: SELinux policy compiler
 Name: checkpolicy
-Version: 1.25.5
+Version: 1.25.8
 Release: 1
 License: GPL
 Group: Development/System
@@ -46,6 +46,17 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/checkpolicy.8.gz
 
 %changelog
+* Thu Aug 11 2005 Dan Walsh <dwalsh@redhat.com> 1.25.8-1
+- Update to NSA Release
+	* Updated checkpolicy and dispol for the new avtab format.
+	  Converted users of ebitmaps to new inline operators.
+  	  Note:  The binary policy format version has been incremented to 
+	  version 20 as a result of these changes.  To build a policy
+	  for a kernel that does not yet include these changes, use
+	  the -c 19 option to checkpolicy.
+	* Merged patch to prohibit use of "self" as a type name from Jason Tang (Tresys).
+	* Merged patch to fix dismod compilation from Joshua Brindle (Tresys).
+
 * Wed Aug 10 2005 Dan Walsh <dwalsh@redhat.com> 1.25.5-1
 - Update to NSA Release
 	* Fixed call to hierarchy checking code to pass the right policydb.
diff --git a/sources b/sources
index 46ebedf..75f9831 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-076cab7322ef14cc51e21237fccf4a90  checkpolicy-1.25.5.tgz
+77a56787b822be766dd8ed8e48b5a9b3  checkpolicy-1.25.8.tgz