diff --git a/Changelog b/Changelog
index 37e651be7..c0b645b22 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,4 @@
+- Cyrus file context update for Gentoo from Corentin Labbe.
 - Portage updates from Sven Vermeulen.
 - Fix init_system_domain() description, pointed out by Elia Pinto.
 - Postgresql selabel_lookup update from KaiGai Kohei.
diff --git a/policy/modules/kernel/corecommands.fc b/policy/modules/kernel/corecommands.fc
index f9a8c4b15..3fae11adc 100644
--- a/policy/modules/kernel/corecommands.fc
+++ b/policy/modules/kernel/corecommands.fc
@@ -204,6 +204,7 @@ ifdef(`distro_gentoo',`
 /usr/lib(64)?/ConsoleKit/run-session.d(/.*)? gen_context(system_u:object_r:bin_t,s0)
 /usr/lib(64)?/courier(/.*)?		gen_context(system_u:object_r:bin_t,s0)
 /usr/lib(64)?/cups(/.*)? 		gen_context(system_u:object_r:bin_t,s0)
+/usr/lib(64)?/cyrus/.*		--	gen_context(system_u:object_r:bin_t,s0)
 /usr/lib(64)?/cyrus-imapd/.*	--	gen_context(system_u:object_r:bin_t,s0)
 /usr/lib(64)?/dpkg/.+		--	gen_context(system_u:object_r:bin_t,s0)
 /usr/lib(64)?/emacsen-common/.*		gen_context(system_u:object_r:bin_t,s0)
diff --git a/policy/modules/kernel/corecommands.te b/policy/modules/kernel/corecommands.te
index 106fb92ed..23a1c3c2a 100644
--- a/policy/modules/kernel/corecommands.te
+++ b/policy/modules/kernel/corecommands.te
@@ -1,4 +1,4 @@
-policy_module(corecommands, 1.14.1)
+policy_module(corecommands, 1.14.2)
 
 ########################################
 #
diff --git a/policy/modules/services/cyrus.fc b/policy/modules/services/cyrus.fc
index 445d93d58..25546bcaf 100644
--- a/policy/modules/services/cyrus.fc
+++ b/policy/modules/services/cyrus.fc
@@ -1,5 +1,7 @@
 /etc/rc\.d/init\.d/cyrus		--	gen_context(system_u:object_r:cyrus_initrc_exec_t,s0)
 
+/usr/lib(64)?/cyrus/master		--	gen_context(system_u:object_r:cyrus_exec_t,s0)
 /usr/lib(64)?/cyrus-imapd/cyrus-master	--	gen_context(system_u:object_r:cyrus_exec_t,s0)
 
+/var/imap(/.*)?					gen_context(system_u:object_r:cyrus_var_lib_t,s0)
 /var/lib/imap(/.*)?				gen_context(system_u:object_r:cyrus_var_lib_t,s0)
diff --git a/policy/modules/services/cyrus.te b/policy/modules/services/cyrus.te
index e182bf473..a01be9d46 100644
--- a/policy/modules/services/cyrus.te
+++ b/policy/modules/services/cyrus.te
@@ -1,4 +1,4 @@
-policy_module(cyrus, 1.10.0)
+policy_module(cyrus, 1.10.1)
 
 ########################################
 #