diff --git a/.cvsignore b/.cvsignore
index 184f82a..8fc9ec3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -84,3 +84,4 @@ libselinux-1.30.6.tgz
 libselinux-1.30.7.tgz
 libselinux-1.30.8.tgz
 libselinux-1.30.10.tgz
+libselinux-1.30.11.tgz
diff --git a/libselinux.spec b/libselinux.spec
index 27d4cef..93a1828 100644
--- a/libselinux.spec
+++ b/libselinux.spec
@@ -1,8 +1,8 @@
-%define libsepolver 1.12.12-1
+%define libsepolver 1.12.14-1
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 1.30.10
-Release: 4
+Version: 1.30.11
+Release: 1
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -115,6 +115,10 @@ exit 0
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Tue May 30 2006 Dan Walsh <dwalsh@redhat.com> 1.30.11-1
+	* Merged matchmediacon and trans_to_raw_context fixes from 
+	  Serge Hallyn.
+
 * Fri May 26 2006 Dan Walsh <dwalsh@redhat.com> 1.30.10-4
 - Remove getseuser
 
diff --git a/sources b/sources
index 524d78c..f042bce 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-88930a8d29ec967efd5589c47cb98346  libselinux-1.30.10.tgz
+fe9198fb7be82dd0d3a18098ca353515  libselinux-1.30.11.tgz