diff --git a/.cvsignore b/.cvsignore
index 7464bc7..7dfbedb 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -44,3 +44,4 @@ libsemanage-1.5.2.tgz
 libsemanage-1.5.3.tgz
 libsemanage-1.5.4.tgz
 libsemanage-1.5.6.tgz
+libsemanage-1.5.8.tgz
diff --git a/libsemanage.spec b/libsemanage.spec
index 61e8954..cc55997 100644
--- a/libsemanage.spec
+++ b/libsemanage.spec
@@ -1,8 +1,8 @@
-%define libsepolver 1.11.4-1
+%define libsepolver 1.11.5-1
 %define libselinuxver 1.29.3-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 1.5.6
+Version: 1.5.8
 Release: 1
 License: GPL
 Group: System Environment/Libraries
@@ -75,6 +75,15 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man3/*
 
 %changelog
+
+* Thu Jan 6 2006 Dan Walsh <dwalsh@redhat.com> 1.5.8-1
+- Upgrade to latest from NSA
+	* Re-applied string and file optimization patch from Russell Coker,
+	  with bug fix.
+	* Reverted string and file optimization patch from Russell Coker.
+	* Clarified error messages from parse_module_headers and 
+	  parse_base_headers for base/module mismatches.
+
 * Thu Jan 6 2006 Dan Walsh <dwalsh@redhat.com> 1.5.6-1
 - Upgrade to latest from NSA
 	* Clarified error messages from parse_module_headers and 
diff --git a/sources b/sources
index cdade8b..cfe3846 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9dfb2ab076c882882a5638020bd0140a  libsemanage-1.5.6.tgz
+af16e7c96d77e58b69edb9fb7ce09417  libsemanage-1.5.8.tgz