diff --git a/.cvsignore b/.cvsignore
index 8e779f5..ae79e35 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -67,3 +67,4 @@ serefpolicy-2.2.38.tgz
 serefpolicy-2.2.39.tgz
 serefpolicy-2.2.40.tgz
 serefpolicy-2.2.41.tgz
+serefpolicy-2.2.42.tgz
diff --git a/modules-targeted.conf b/modules-targeted.conf
index 555d61e..e846eef 100644
--- a/modules-targeted.conf
+++ b/modules-targeted.conf
@@ -1048,14 +1048,14 @@ mono = base
 #
 # Spam Blocker
 # 
-pyzor = base
+pyzor = module
 
 # Layer: services
 # Module: amavis
 #
 # Anti-virus
 # 
-amavis = base
+amavis = module
 
 # Layer: services
 # Module: clamav
diff --git a/selinux-policy.spec b/selinux-policy.spec
index 5c4589a..8738670 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -15,7 +15,7 @@
 %define CHECKPOLICYVER 1.30.1-2
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.2.41
+Version: 2.2.42
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -335,6 +335,9 @@ semodule -b base.pp -r bootloader -r clock -r dpkg -r fstools -r hotplug -r init
 %endif
 
 %changelog
+* Thu May 18 2006 Dan Walsh <dwalsh@redhat.com> 2.2.42-1
+- Upgrade to upstream
+
 * Thu May 18 2006 Dan Walsh <dwalsh@redhat.com> 2.2.41-1
 - allow hal to read boot_t files
 - Upgrade to upstream
diff --git a/sources b/sources
index 9c3eb22..c808ea8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3aef272c81e22416af143b520e001c75  serefpolicy-2.2.41.tgz
+2790acad9ae17a8b00b93c2adfebffd4  serefpolicy-2.2.42.tgz