diff --git a/libsemanage.spec b/libsemanage.spec
index b8585a6..09b2d90 100644
--- a/libsemanage.spec
+++ b/libsemanage.spec
@@ -2,12 +2,11 @@
 %define libselinuxver 1.30.22-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 1.6.13
-Release: 2
+Version: 1.6.15
+Release: 1
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
-Patch: libsemanage-rhat.patch
 
 BuildRoot: %{_tmppath}/%{name}-buildroot
 BuildRequires: libselinux-devel >= %{libselinuxver} 
@@ -41,7 +40,6 @@ needed for developing applications that manipulate binary policies.
 
 %prep
 %setup -q
-%patch -p1 -b .rhat
 
 %build
 make clean
@@ -77,6 +75,12 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man3/*
 
 %changelog
+
+* Sat Aug 12 2006 Dan Walsh <dwalsh@redhat.com> - 1.6.15-1
+- Upgrade to latest from NSA
+	* Merged separate local file contexts patch from Chris PeBenito.
+	* Merged patch to make most copy errors non-fatal from Dan Walsh.
+
 * Thu Aug 10 2006 Dan Walsh <dwalsh@redhat.com> - 1.6.13-3
 - Change other updates to be non-fatal