diff --git a/.cvsignore b/.cvsignore
index 968abab..839cea6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -86,3 +86,4 @@ libselinux-1.30.8.tgz
 libselinux-1.30.10.tgz
 libselinux-1.30.11.tgz
 libselinux-1.30.12.tgz
+libselinux-1.30.15.tgz
diff --git a/libselinux.spec b/libselinux.spec
index 99db334..9fd4b9b 100644
--- a/libselinux.spec
+++ b/libselinux.spec
@@ -1,12 +1,11 @@
 %define libsepolver 1.12.14-1
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 1.30.12
-Release: 2
+Version: 1.30.15
+Release: 1
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
-Patch: libselinux-rhat.patch
 
 BuildRequires: libsepol-devel >= %{libsepolver} swig
 Requires: libsepol >= %{libsepolver} setransd
@@ -48,7 +47,6 @@ needed for developing SELinux applications.
 
 %prep
 %setup -q
-%patch -p1 -b .rhat
 
 %build
 make clean
@@ -117,6 +115,16 @@ exit 0
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Fri Jun 16 2006 Dan Walsh <dwalsh@redhat.com> 1.30.15-1
+- Upgrade to latest from NSA
+	* Merged patch from Dan Walsh with:
+	*   Added selinux_getpolicytype() function.
+	*   Modified setrans code to skip processing if !mls_enabled.
+	* Set errno in the !selinux_mnt case.
+	* Allocate large buffers from the heap, not on stack.
+	  Affects is_context_customizable, selinux_init_load_policy,
+	  and selinux_getenforcemode.
+
 * Thu Jun 8 2006 Dan Walsh <dwalsh@redhat.com> 1.30.12-2
 - Add selinux_getpolicytype()
 
diff --git a/sources b/sources
index 175ed11..30f1f62 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3d3f90d574b9a3dde9d81ad3c13d7a6a  libselinux-1.30.12.tgz
+029134e11d4d7de697888b2faa0218a1  libselinux-1.30.15.tgz