diff --git a/.cvsignore b/.cvsignore
index f17d28c..02a2a37 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
 libsemanage-1.0.tgz
 libsemanage-1.1.4.tgz
+libsemanage-1.1.6.tgz
diff --git a/libsemanage.spec b/libsemanage.spec
index f84dfc7..fc14ab2 100644
--- a/libsemanage.spec
+++ b/libsemanage.spec
@@ -1,11 +1,10 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage-devel
-Version: 1.1.4
+Version: 1.1.6
 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
 
 %description
@@ -30,7 +29,6 @@ needed for developing applications that manipulate binary policies.
 
 %prep
 %setup -q -n libsemanage-%{version}
-%patch  -p1 -b .rhat
 
 %build
 make CFLAGS="%{optflags}"
@@ -41,6 +39,7 @@ mkdir -p ${RPM_BUILD_ROOT}/%{_lib}
 mkdir -p ${RPM_BUILD_ROOT}/%{_libdir} 
 mkdir -p ${RPM_BUILD_ROOT}%{_includedir} 
 make DESTDIR="${RPM_BUILD_ROOT}" LIBDIR="${RPM_BUILD_ROOT}%{_libdir}" SHLIBDIR="${RPM_BUILD_ROOT}/%{_lib}" install
+rm -rf ${RPM_BUILD_ROOT}/usr/share/semod/semod.conf
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -50,7 +49,17 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_includedir}/semanage/*.h
 
 %changelog
-* Thu Jul 7 2005 Dan Walsh <dwalsh@redhat.com> 1.0-1
+* Thu Sep 1 2005 Dan Walsh <dwalsh@redhat.com> 1.1.6-1
+- Update from NSA
+	* Merged semod.conf template patch from Dan Walsh (Red Hat),
+	but restored location to /usr/share/semod/semod.conf.
+	* Fixed several bugs found by valgrind.
+	* Fixed bug in prior patch for the semod_build_module_list leak.
+	* Merged errno fix from Joshua Brindle (Tresys).
+	* Merged fix for semod_build_modules_list leak on error path
+	  from Serge Hallyn (IBM).  Bug found by Coverity.
+
+* Thu Aug 25 2005 Dan Walsh <dwalsh@redhat.com> 1.1.3-1
 - Update from NSA
 	* Merged errno fix from Joshua Brindle (Tresys).
 	* Merged fix for semod_build_modules_list leak on error path
diff --git a/sources b/sources
index 0a65d18..14d47f0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8b23484ef885b373eeb517c2b0db038c  libsemanage-1.1.4.tgz
+b79c87427276bc8c2cda2064b321be8b  libsemanage-1.1.6.tgz