diff --git a/Changelog b/Changelog
index 256b41e8e..5d40a43fa 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,4 @@
+- Add support for libselinux 2.0.5 init_selinuxmnt() changes.
 - Patch for misc fixes to bluetooth from Dan Walsh.
 - Patch for misc fixes to kerberos from Dan Walsh.
 - Patch to start deprecating usercanread attribute from Ryan Bradetich.
diff --git a/policy/modules/kernel/selinux.if b/policy/modules/kernel/selinux.if
index 8ee079501..a7d7e7ee9 100644
--- a/policy/modules/kernel/selinux.if
+++ b/policy/modules/kernel/selinux.if
@@ -16,6 +16,15 @@
 ## </param>
 #
 interface(`selinux_get_fs_mount',`
+	gen_require(`
+		type security_t;
+	')
+
+	# starting in libselinux 2.0.5, init_selinuxmnt() will
+	# attempt to short circuit by checking if SELINUXMNT
+	# (/selinux) is already a selinuxfs
+	allow $1 security_t:filesystem getattr;
+
 	# read /proc/filesystems to see if selinuxfs is supported
 	# then read /proc/self/mount to see where selinuxfs is mounted
 	kernel_read_system_state($1)
diff --git a/policy/modules/kernel/selinux.te b/policy/modules/kernel/selinux.te
index af3933173..5f24a2564 100644
--- a/policy/modules/kernel/selinux.te
+++ b/policy/modules/kernel/selinux.te
@@ -1,5 +1,5 @@
 
-policy_module(selinux,1.2.0)
+policy_module(selinux,1.2.1)
 
 ########################################
 #