diff --git a/.cvsignore b/.cvsignore
index 69a42b7..926d7aa 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -62,3 +62,4 @@ serefpolicy-2.2.34.tgz
 selinux-policy-2.2.35-1.src.rpm
 serefpolicy-2.2.35.tgz
 serefpolicy-2.2.36.tgz
+serefpolicy-2.2.37.tgz
diff --git a/Makefile.devel b/Makefile.devel
index 0c128c4..3854849 100644
--- a/Makefile.devel
+++ b/Makefile.devel
@@ -5,6 +5,10 @@ AWK ?= gawk
 NAME ?= $(shell $(AWK) -F= '/^SELINUXTYPE/{ print $$2 }' /etc/selinux/config)
 
 MLSENABLED := $(shell cat /selinux/mls)
+ifeq ($(MLSENABLED),)
+	MLSENABLED := 1
+endif
+
 ifeq ($(MLSENABLED),1)
 MCSFLAG=-mcs
 endif
@@ -13,4 +17,3 @@ TYPE ?= $(NAME)${MCSFLAG}
 HEADERDIR := $(SHAREDIR)/targeted/include
 include $(HEADERDIR)/Makefile
 
-
diff --git a/modules-targeted.conf b/modules-targeted.conf
index 9b9c19a..b380778 100644
--- a/modules-targeted.conf
+++ b/modules-targeted.conf
@@ -1057,3 +1057,10 @@ pyzor = base
 # 
 amavis = base
 
+# Layer: services
+# Module: clamav
+#
+# ClamAV Virus Scanner
+# 
+clamav = module
+
diff --git a/selinux-policy.spec b/selinux-policy.spec
index ca28438..4a1c490 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -15,8 +15,8 @@
 %define CHECKPOLICYVER 1.30.1-2
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.2.36
-Release: 2
+Version: 2.2.37
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -267,8 +267,6 @@ SELinux Reference policy targeted base module.
 %triggerpostun targeted -- selinux-policy-targeted <= 2.0.7
 %rebuildpolicy targeted
 
-%rebuildpolicy targeted
-
 %files targeted
 %fileList targeted
 
@@ -337,6 +335,9 @@ semodule -b base.pp -r bootloader -r clock -r dpkg -r fstools -r hotplug -r init
 %endif
 
 %changelog
+* Wed May 3 2006 Dan Walsh <dwalsh@redhat.com> 2.2.37-1
+- Update to upstream
+
 * Mon May 1 2006 Dan Walsh <dwalsh@redhat.com> 2.2.36-2
 - Fix libjvm spec
 
@@ -367,7 +368,7 @@ semodule -b base.pp -r bootloader -r clock -r dpkg -r fstools -r hotplug -r init
 - Add James Antill patch for xen
 - Many fixes for pegasus
 
-* Sat Apr 14 2006 Dan Walsh <dwalsh@redhat.com> 2.2.32-2
+* Sat Apr 15 2006 Dan Walsh <dwalsh@redhat.com> 2.2.32-2
 - Add unconfined_mount_t
 - Allow privoxy to connect to httpd_cache
 - fix cups labeleing on /var/cache/cups
@@ -375,7 +376,7 @@ semodule -b base.pp -r bootloader -r clock -r dpkg -r fstools -r hotplug -r init
 * Fri Apr 14 2006 Dan Walsh <dwalsh@redhat.com> 2.2.32-1
 - Update to latest from upstream
 
-* Thu Apr 14 2006 Dan Walsh <dwalsh@redhat.com> 2.2.31-1
+* Fri Apr 14 2006 Dan Walsh <dwalsh@redhat.com> 2.2.31-1
 - Update to latest from upstream
 - Allow mono and unconfined to talk to initrc_t dbus objects
 
@@ -412,14 +413,14 @@ semodule -b base.pp -r bootloader -r clock -r dpkg -r fstools -r hotplug -r init
 - Granted xen access to /boot, allowed mounting on xend_var_lib_t, and allowed
   xenstored_t rw access to the xen device node.
 
-* Mon Mar 30 2006 Dan Walsh <dwalsh@redhat.com> 2.2.29-4
+* Tue Apr 4 2006 Dan Walsh <dwalsh@redhat.com> 2.2.29-4
 - More textrel_shlib_t file path fixes
 - Add ada support
 
-* Mon Mar 30 2006 Dan Walsh <dwalsh@redhat.com> 2.2.29-3
+* Mon Apr 3 2006 Dan Walsh <dwalsh@redhat.com> 2.2.29-3
 - Get auditctl working in MLS policy
 
-* Mon Mar 30 2006 Dan Walsh <dwalsh@redhat.com> 2.2.29-2
+* Mon Apr 3 2006 Dan Walsh <dwalsh@redhat.com> 2.2.29-2
 - Add mono dbus support
 - Lots of file_context fixes for textrel_shlib_t in FC5
 - Turn off execmem auditallow since they are filling log files
diff --git a/sources b/sources
index 65b62cb..75e6d8d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-91e6d7b0f112e38801851e5bed4e627c  serefpolicy-2.2.36.tgz
+8ab58718da02004bd2dca6156cf09e8d  serefpolicy-2.2.37.tgz