diff --git a/modules-mls-contrib.conf b/modules-mls-contrib.conf
index 038c868e..83ff8c37 100644
--- a/modules-mls-contrib.conf
+++ b/modules-mls-contrib.conf
@@ -47,12 +47,12 @@ alsa = module
 # 
 amanda = module
 
-# Layer: services
-# Module: amavis
+# Layer: contrib
+# Module: antivirus
 #
 # Anti-virus
 # 
-amavis = module
+antivirus = module
 
 # Layer: admin
 # Module: amtu
@@ -243,20 +243,13 @@ chrome = module
 # 
 chronyd = module
 
-q# Layer: services
+# Layer: services
 # Module: cipe
 #
 # Encrypted tunnel daemon
 # 
 cipe = module
 
-# Layer: services
-# Module: clamav
-#
-# ClamAV Virus Scanner
-# 
-clamav = module
-
 # Layer: services
 # Module: clogd
 #
diff --git a/modules-targeted-contrib.conf b/modules-targeted-contrib.conf
index 99c2554a..e2bab2c7 100644
--- a/modules-targeted-contrib.conf
+++ b/modules-targeted-contrib.conf
@@ -68,13 +68,6 @@ alsa = module
 # 
 amanda = module
 
-# Layer: services
-# Module: amavis
-#
-# Anti-virus
-# 
-amavis = module
-
 # Layer: admin
 # Module: amtu
 #
@@ -327,12 +320,6 @@ chronyd = module
 # 
 cipe = module
 
-# Layer: services
-# Module: clamav
-#
-# ClamAV Virus Scanner
-# 
-clamav = module
 
 # Layer: services
 # Module: clogd
diff --git a/selinux-policy.spec b/selinux-policy.spec
index 442add0c..dc836cfd 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -252,9 +252,9 @@ fi;
 . %{_sysconfdir}/selinux/config; \
 if [ -e /etc/selinux/%2/.rebuild ]; then \
    rm /etc/selinux/%2/.rebuild; \
-   (cd /etc/selinux/%2/modules/active/modules; rm -f gnomeclock.pp ctdbd.pp fcoemon.pp isnsd.pp l2tpd.pp qemu.pp nsplugin.pp razor.pp pyzord.pp phpfpm.pp hotplug.pp consoletype.pp kudzu.pp howl.pp) \
+   (cd /etc/selinux/%2/modules/active/modules; rm -f amavis.pp clamav.pp gnomeclock.pp ctdbd.pp fcoemon.pp isnsd.pp l2tpd.pp qemu.pp nsplugin.pp razor.pp pyzord.pp phpfpm.pp hotplug.pp consoletype.pp kudzu.pp howl.pp) \
    if [ %1 -ne 1 ]; then \
-	/usr/sbin/semodule -n -s %2 -r gnomeclock matahari xfs kudzu kerneloops execmem openoffice ada tzdata hal hotplug howl java mono moilscanner gamin audio_entropy audioentropy iscsid polkit_auth polkit rtkit_daemon ModemManager telepathysofiasip ethereal passanger qpidd pyzor razor pki-selinux phpfpm consoletype ctdbd fcoemon isnsd l2tp  2>/dev/null; \
+	/usr/sbin/semodule -n -s %2 -r amavis clamav gnomeclock matahari xfs kudzu kerneloops execmem openoffice ada tzdata hal hotplug howl java mono moilscanner gamin audio_entropy audioentropy iscsid polkit_auth polkit rtkit_daemon ModemManager telepathysofiasip ethereal passanger qpidd pyzor razor pki-selinux phpfpm consoletype ctdbd fcoemon isnsd l2tp  2>/dev/null; \
    fi \
    /usr/sbin/semodule -B -n -s %2; \
 else \