diff --git a/.cvsignore b/.cvsignore
index 003f877..9e5bb48 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -90,3 +90,4 @@ serefpolicy-2.3.12.tgz
 serefpolicy-2.3.13.tgz
 serefpolicy-2.3.14.tgz
 serefpolicy-2.3.15.tgz
+serefpolicy-2.3.16.tgz
diff --git a/modules-targeted.conf b/modules-targeted.conf
index 52a3a37..1c218f3 100644
--- a/modules-targeted.conf
+++ b/modules-targeted.conf
@@ -924,13 +924,6 @@ authlogin = base
 libraries = base
 
 # Layer: system
-# Module: raid
-#
-# RAID array management tools
-# 
-raid = off
-
-# Layer: system
 # Module: userdomain
 #
 # Policy for user domains
@@ -1158,3 +1151,10 @@ raid = base
 # 
 smartmon = module
 
+# Layer: system
+# Module: iscsi
+#
+# Open-iSCSI daemon
+# 
+iscsi = module
+
diff --git a/selinux-policy.spec b/selinux-policy.spec
index ad515f2..970b31d 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -16,8 +16,8 @@
 %define CHECKPOLICYVER 1.30.11-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.3.15
-Release: 2
+Version: 2.3.16
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -349,6 +349,9 @@ semodule -b base.pp -r bootloader -r clock -r dpkg -r fstools -r hotplug -r init
 %endif
 
 %changelog
+* Mon Sep 25 2006 Dan Walsh <dwalsh@redhat.com> 2.3.16-1
+- Update with upstream
+
 * Mon Sep 25 2006 Dan Walsh <dwalsh@redhat.com> 2.3.15-2
 - mls fixes 
 
diff --git a/sources b/sources
index 6dc7020..0399c72 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c26b613471b3742750204c54e4336a48  serefpolicy-2.3.15.tgz
+549a42b9073f1aae693dd3481a11c9ff  serefpolicy-2.3.16.tgz